Updated and working ebuilds for 2.3 and 2.1

6 files changed, 115 insertions, 18 deletions

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 43928c3..554faef 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,5 +1,10 @@
-AUX Makefile 2297 RMD160 cb547b9644ae1f1e013f5627fca57d1b47173cde SHA1 8c7308662ab9ba793c285d5fe6a14b8262875c59 SHA256 17fddeaea2c5d94ed0ee01bf4317a9f20f141ea68a92f78ae4c8b7a36fc6c9bd
+AUX Makefile 1815 RMD160 ebc7bb5f556a184e110b2bd021341363b2a3d4bc SHA1 5084e85a0fd7b250360c7ad2e736da737b9f8ee8 SHA256 3dab5c19a13e0cedf78e670c8e6e3da6f964047037c2cf0bdce79e3c289d0ae8
+AUX atiocl32.icd 15 RMD160 69747a1050f4e6893fcba6d36b7a4d9f9e163ec6 SHA1 1f3cbd9b1daa8fc477c3f15b7dcd99832f1eec98 SHA256 eb5907a4f6081d6691d438c8fde40745749f484d02edfa12c129c734caeaf0ca
+AUX atiocl64.icd 15 RMD160 1da8cf0f8e40b21573a4e2965672ed36e6fac856 SHA1 193caa5eb42e4818adae1ce1cab841b8a2a71163 SHA256 b1f5b059527f1adee87adc7fbd18c4102126b7f2d1daa05104e745c301355f68
+DIST ati-stream-sdk-v2.1-lnx32.tgz 51590733 RMD160 fa3bf3cc628e1db2e38133ae9d6b833d15b54a39 SHA1 e0ecf04122685f9bf882ee7af9bab276e125904b SHA256 caab5cfed5219ccd0ae62b8fb489a8aa0499581d5cfd173ab4c4ad910bcb5271
+DIST ati-stream-sdk-v2.1-lnx64.tgz 82901409 RMD160 778f0d46e96f77b345a963b1720fce43c0eb96ef SHA1 dbf468d73b19462cf359a0b7248c20cc3bf4ae93 SHA256 46f6e47172a412d5ee3b3aea60fc869ebd26fbccf7fadc9ec5e4146c38f4a7ff
 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 2283 RMD160 895b4b104aff70c3bdfcb9cee4bbb460d65c9538 SHA1 3861f98499025bd4d74bbddd0f862e634911f47b SHA256 30f925eba989538ac81801bf734670b03da0100f7cd271767259161c0c4a989a
+EBUILD ati-stream-sdk-2.1.ebuild 2423 RMD160 511fb3bdcb334b7569e9f66eb61fd1d482f85b23 SHA1 36f4f8fe721946cc698594dd8d779186f6e9a9ac SHA256 1d1af95ab9b6e9e23d998e43a69f289b09d94574ecd114fc1e5af530031acfaa
+EBUILD ati-stream-sdk-2.3-r1.ebuild 2427 RMD160 b94bddd0a82bfcc186d007ea35085cda754b40fd SHA1 9847f7638b72d6339d126bad19470203a009c9a0 SHA256 323406408eb32b40e9700210dde19c528c44a396cfc697448aa8a955692ae097
 MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SHA1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a736b9a5b3f1d8ea110446c18e988a3b884d0dca33b7
diff --git a/dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild b/dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild
new file mode 100644
index 0000000..82584b8
--- /dev/null
+++ b/dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+inherit eutils
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Enable compiling code and loading it on ATI/AMD GPU"
+HOMEPAGE="http://developer.amd.com/GPU/ATISTREAMSDK/Pages/default.aspx"
+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-OCL"
+SLOT="0"
+KEYWORDS=""
+IUSE="examples doc multilib"
+RESTRICT="strip fetch"
+RDEPEND="media-libs/freeglut
+	examples? ( media-libs/glew )
+	x11-drivers/ati-drivers
+	!dev-util/nvidia-cuda-sdk
+	!dev-util/nvidia-cuda-toolkit"
+
+QA_EXECSTACK="opt/${PN}/lib*/libatiocl??.so"
+QA_DT_HASH="/opt/ati-stream-sdk/lib/x86/libGLEW.so
+	/opt/ati-stream-sdk/lib/x86_64/libGLEW.so"
+
+S="${WORKDIR}/${MY_P}"
+
+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(){
+	default_src_unpack
+
+	mv ${MY_P}-lnx* ${MY_P} || die
+	cp "${FILESDIR}"/Makefile ${MY_P}/ || die
+}
+
+src_prepare(){
+	if use examples; then
+		sed -i -e 's/samples/examples/g'  make/openclsdkrules.mk make/openclsdkdefs.mk\
+			|| die "Sed failed"
+	fi
+}
+
+src_compile(){ true; }
+
+src_install(){
+	local DEST=/opt/${PN}
+	local LIBDIR=
+
+	rm include/GL/{glext.h,glut.h} || die
+
+	if use amd64; then
+		LIBDIR=x86_64
+		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
+		LIBDIR=x86
+		emake DESTDIR="${D}" ARCH="x86" install || die "Install failed";
+	fi
+
+	cat > "${T}/99${PN}" << EOF
+PATH=${DEST}/bin
+ROOTPATH=${DEST}/bin
+LDPATH=${DEST}/lib/${LIBDIR}
+EOF
+	doenvd "${T}/99${PN}" || die
+
+	if use examples; then
+		insinto ${DEST}/examples
+		doins -r samples/* || die
+		insinto ${DEST}
+		doins -r make || die
+	fi
+
+	if use doc; then
+		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."
+}
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 c6e51d7..7545601 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
@@ -61,8 +61,12 @@ src_install(){
 			emake DESTDIR="${D}" ARCH="x86" install-lib \
 				|| die "Multilib install failed"
 		fi
+		insinto /etc/OpenCL/vendors
+		doins "${FILESDIR}"/atiocl64.icd || die
 	else
 		emake DESTDIR="${D}" ARCH="x86" install || die "Install failed";
+		insinto /etc/OpenCL/vendors
+		doins "${FILESDIR}"/atiocl32.icd || die
 	fi
 
 	cat > "${T}/99${PN}" << EOF
diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index d5bbb83..49adfe3 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -24,20 +24,6 @@ DSUFX=
 SUFX=32
 endif
 
-install-etc:
-	test -z "$(ETCDIR)" || $(MKDIR) "$(ETCDIR)"
-	tar -xzf icd-registration.tgz || exit 1
-	@list='$(ETCFILES)'; for f in $$list; do\
-		if test -f $$f; then\
-			f1=`echo $$f | sed -e 's|etc/||g'`;\
-			base=`basename $$f1`;\
-			dir=`echo $$f1 | sed -e "s|$$base||g"`;\
-			test -z "$(ETCDIR)/$$dir" || $(MKDIR) "$(ETCDIR)/$$dir";\
-			echo "$(INSTALLDAT) $$f $(ETCDIR)/$$f1";\
-			$(INSTALLDAT) "$$f" $(ETCDIR)/$$f1 || exit 1;\
-		else :; fi;\
-	done
-
 install-bin:
 	test -z "$(BINDIR)" || $(MKDIR) "$(BINDIR)"
 	@list='$(BINFILES)'; for f in $$list; do\
@@ -52,7 +38,7 @@ install-lib:
 	test -z "$(LIBDIR)" || $(MKDIR) "$(LIBDIR)"
 	@list='$(LIBFILES)'; for f in $$list; do\
 		if test -f $$f; then\
-			f1=`echo $$f | sed -e 's|lib/||g' -e 's|x86*/||g'`;\
+			f1=`echo $$f | sed -e 's|lib/||g'`;\
 			base=`basename $$f1`;\
 			dir=`echo $$f1 | sed -e "s|$$base||g"`;\
 			test -z "$(LIBDIR)/$$dir" || $(MKDIR) "$(LIBDIR)/$$dir";\
@@ -74,4 +60,4 @@ install-include:
 		else :; fi;\
 	done
 
-install: install-etc install-bin install-lib install-include
+install: install-bin install-lib install-include
diff --git a/dev-util/ati-stream-sdk/files/atiocl32.icd b/dev-util/ati-stream-sdk/files/atiocl32.icd
new file mode 100644
index 0000000..b7512cf
--- /dev/null
+++ b/dev-util/ati-stream-sdk/files/atiocl32.icd
@@ -0,0 +1 @@
+libatiocl32.so
diff --git a/dev-util/ati-stream-sdk/files/atiocl64.icd b/dev-util/ati-stream-sdk/files/atiocl64.icd
new file mode 100644
index 0000000..e16eab5
--- /dev/null
+++ b/dev-util/ati-stream-sdk/files/atiocl64.icd
@@ -0,0 +1 @@
+libatiocl64.so