Working version of the ati-stream-sdk for testing.

2 files changed, 26 insertions, 11 deletions

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index fa28365..43928c3 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile 2297 RMD160 cb547b9644ae1f1e013f5627fca57d1b47173cde SHA1 8c7308662ab9ba793c285d5fe6a14b8262875c59 SHA256 17fddeaea2c5d94ed0ee01bf4317a9f20f141ea68a92f78ae4c8b7a36fc6c9bd
 DIST ati-stream-sdk-v2.3-lnx32.tgz 49912168 RMD160 07c045de3118531472672e9ef7b3763cb32f7d68 SHA1 972bdbe6942e52411a2f041720348e857f17c388 SHA256 07fd15a51a678c4378767f61466daf9da21d0bab6088a97a70136dd8c976aca6
 DIST ati-stream-sdk-v2.3-lnx64.tgz 78659015 RMD160 57af36f62e590ae54cb9d43b880735979b77466c SHA1 43c94e5126563fe3fa4cb92fb6dd20f12864a86d SHA256 f92537d1fc306af0bff1441af4669bf2fa668654b12d9fb53a3a872dc8826cad
-EBUILD ati-stream-sdk-2.3-r1.ebuild 1785 RMD160 a49779dcf7c9cc2c759edd252a8de82fb2b4731a SHA1 78f96f8730fb3da67dc6939a646567bf82174217 SHA256 b1f1607754f6ca3cb4784242dd260a9e8a6738d08fc7923dbf02ecdd9ee576aa
+EBUILD ati-stream-sdk-2.3-r1.ebuild 2283 RMD160 895b4b104aff70c3bdfcb9cee4bbb460d65c9538 SHA1 3861f98499025bd4d74bbddd0f862e634911f47b SHA256 30f925eba989538ac81801bf734670b03da0100f7cd271767259161c0c4a989a
 MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SHA1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a736b9a5b3f1d8ea110446c18e988a3b884d0dca33b7
diff --git a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
index 4a993c0..c6e51d7 100644
--- a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
+++ b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
@@ -13,26 +13,28 @@ SRC_URI=" \
 	amd64? ( http://download2-developer.amd.com/amd/Stream20GA/${MY_P}-lnx64.tgz ) \
 	x86? ( http://download2-developer.amd.com/amd/Stream20GA/${MY_P}-lnx32.tgz )"
 
-LICENSE="AMD GPL-1 as-is"
+LICENSE="AMD-OCL"
 SLOT="0"
 KEYWORDS=""
 IUSE="examples doc multilib"
 RESTRICT="strip fetch"
 RDEPEND="media-libs/freeglut
+	examples? ( media-libs/glew )
 	x11-drivers/ati-drivers
-	examples? ( media-libs/glew )"
+	!dev-util/nvidia-cuda-sdk
+	!dev-util/nvidia-cuda-toolkit"
 
 QA_EXECSTACK="opt/${PN}/lib*/libatiocl??.so"
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_nofetch() {
+pkg_nofetch(){
 	ewarn "Proprietary software. Download at"
 	ewarn "http://developer.amd.com/gpu/AMDAPPSDK/downloads/Pages/default.aspx"
 	ewarn "and move it to distfiles"
 }
 
-src_unpack() {
+src_unpack(){
 	default_src_unpack
 
 	mv ${MY_P}-lnx* ${MY_P} || die
@@ -46,15 +48,19 @@ src_prepare(){
 	fi
 }
 
-src_compile() { true; }
+src_compile(){ true; }
 
-src_install() {
+src_install(){
 	local DEST=/opt/${PN}
 
 	rm include/GL/{glext.h,glut.h} || die
 
 	if use amd64; then
 		emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed";
+		if use multilib; then
+			emake DESTDIR="${D}" ARCH="x86" install-lib \
+				|| die "Multilib install failed"
+		fi
 	else
 		emake DESTDIR="${D}" ARCH="x86" install || die "Install failed";
 	fi
@@ -62,10 +68,9 @@ src_install() {
 	cat > "${T}/99${PN}" << EOF
 PATH=${DEST}/bin
 ROOTPATH=${DEST}/bin
-LDPATH=${DEST}/$(get_libdir)
-LD_LIBRARY_PATH=${DEST}/$(get_libdir)
+LDPATH=${DEST}/lib
 EOF
-	doenvd "${T}/99${PN}"
+	doenvd "${T}/99${PN}" || die
 
 	if use examples; then
 		insinto ${DEST}/examples
@@ -75,6 +80,16 @@ EOF
 	fi
 
 	if use doc; then
-		dodoc docs/opencl/*
+		dodoc docs/opencl/* || die
 	fi
 }
+
+pkg_postinst(){
+	elog "If you want to be able to compile without passing"
+	elog "-I /opt/ati-stream-sdk/include to gcc, please set"
+	elog "C_INCLUDE_PATH and CPLUS_INCLUDE_PATH to that directory"
+	elog
+	elog "Also, if you do not want to pass -L /opt/ati-stream-sdk/lib/x86(_64)"
+	elog "to gcc for every use of -lOpenCL, add that directory to"
+	elog "LD_LIBRARY_PATH."
+}