[gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-23 14:48 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-23 14:48 UTC (permalink / raw
  To: gentoo-commits

commit:     9d9658e5df18e814af358393c5cf8cf5e720fa06
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 14:44:00 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 14:44:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=9d9658e5

Attempt #2.

---
 dev-util/ati-stream-sdk/Manifest                   |    2 +
 .../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild    |   72 ++++++++++++++++++++
 dev-util/ati-stream-sdk/files/Makefile             |   65 ++++++++++++++++++
 3 files changed, 139 insertions(+), 0 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index b114817..048078b 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,4 +1,6 @@
+AUX Makefile 1741 RMD160 de6d4123c6e990c930fd1fc5c6ebd79569000f8b SHA1 819430cc79c3784f140110871ec067869edff5a6 SHA256 725ebe9c0fb678c02c61b644c1678c39ff79f1c6d53fe9e3632bdbc7a806f3a4
 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 1538 RMD160 3502b693551666c4ba3ccff46f6fe3102ab24427 SHA1 4045b9d514c9d848ad5d20e6769f227ad98535b3 SHA256 3d635640e522688b0ff096c7b644a52c5e60f2577c6f796d1fa9cef4737d07de
 EBUILD ati-stream-sdk-2.3.ebuild 1902 RMD160 3223fecbf191d822e896965ba63be3ebb2475d1e SHA1 b30d65c95630319b86c0b7a4fe5cd22323379093 SHA256 1f55cff88074875c4867fd52441fd266fbc3ab96016865f93eb21a4a07598948
 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
new file mode 100644
index 0000000..a09eb35
--- /dev/null
+++ b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+inherit eutils multilib
+
+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 GPL-1 as-is"
+SLOT="0"
+KEYWORDS=""
+IUSE="examples doc multilib"
+RESTRICT="strip fetch"
+RDEPEND="media-libs/freeglut
+	x11-drivers/ati-drivers
+	examples? ( media-libs/glew )"
+
+QA_EXECSTACK="opt/${PN}/lib*/libatiocl??.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_compile() { true; }
+
+src_install() {
+	local DEST=/opt/${PN}
+
+	rm include/GL/{glext.h,glut.h} || die
+
+	if use amd64; then
+		emake DESTDIR=${D} ARCH="amd64" install;
+	else
+		emake DESTDIR=${D} install-x86;
+	fi
+
+	cat > "${T}/99${PN}" << EOF
+PATH=${DEST}/bin
+ROOTPATH=${DEST}/bin
+LDPATH=${DEST}/$(get_libdir)
+EOF
+	doenvd "${T}/99${PN}"
+
+	if use examples; then
+		insinto ${DEST}/exmaples
+		doins -r samples/* || die
+		insinto ${DEST}
+		doins -r make || die
+	fi
+
+	if use doc; then
+		dodoc docs/opencl/*
+	fi
+}

diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
new file mode 100644
index 0000000..f226f4b
--- /dev/null
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -0,0 +1,65 @@
+DESTDIR=
+PREFIX=$(DESTDIR)/opt/
+LIBDIR=$(PREFIX)lib/
+BINDIR=$(PREFIX)bin/
+INCDIR=$(PREFIX)include/
+
+INSTALLBIN=install
+INSTALLDAT=install -m0644
+INSTALLDIR=install -d
+MKDIR=mkdir -p
+
+ARCH:=x86
+BINFILES=bin/x86$(DSUFX)/clc 
+LIBFILES=lib/x86$(DSUFX)/libOpenCL.so lib/x86$(DSUFX)/libatiolc$(SUFX).so lib/x86$(DSUFX)/libGLEW.so lib/gpu/builtins-7xx.bc lib/gpu/builtins-evergreen.bc lib/gpu/builtins-gpucommon.bc lib/x86$(DSUFX)/builtins-x86$(DSUFX).bc
+INCDIRS=include/CL include/GL include/OVDecode
+INCFILES=include/cal*.h
+
+ifeq ($(ARCH),amd64)
+DSUFX=_64
+SUFX=64
+else
+DSUFX=
+SUFX=32
+endif
+
+install:
+	test -z "$(BINDIR)" || $(MKDIR) "$(BINDIR)"
+	test -z "$(LIBDIR)" || $(MKDIR) "$(LIBDIR)"
+	test -z "$(INCDIR)" || $(MKDIR) "$(INCDIR)"
+	@list='$(BINFILES)'; for f in $$list; do\
+		if test -f $$f; then\
+			f1=`basename $$f`;\
+			echo "$(INSTALLBIN) $$f $(BINDIR)$$f1";\
+			$(INSTALLBIN) "$$f" "$(BINDIR)$$f1" || exit 1;\
+		else :; fi;\
+	done
+	@list='$(LIBFILES)'; for f in $$list; do\
+		if test -f $$f; then\
+			f1=`echo $$f | sed -e 's|lib/||g' -e 's|x86*/||g'`;\
+			base=`basename $$f1`;\
+			dir=`echo $$f1 | sed -e "s|$$base||g"`;\
+			test -z "$(LIBDIR)$$dir" || $(MKDIR) "$(LIBDIR)$$dir";\
+			echo "$(INSTALLBIN) $$f $(LIBDIR)$$f1";\
+			$(INSTALLBIN) "$$f" "$(LIBDIR)$$f1" || exit 1;\
+		else :; fi;\
+	done
+	@list='$(INCDIRS)'; for f in $$list; do\
+		if test -d $$f; then\
+			f1=`basename $$f`;\
+			echo "$(INSTALLDIR) $$f $(INCDIR)$$f1";\
+			$(INSTALLDIR) $$f $(INCDIR)$$f1 || exit 1;\
+		else :; fi;\
+	done
+	@list='$(INCFILES)'; for f in $$list; do\
+		if test -f $$f; then\
+			f1=`basename $$f`;\
+			echo "$(INSTALLDAT) $$f $(INCDIR)$$f1";\
+			$(INSTALLDAT) $$f $(INCDIR)$$f1 || exit 1;\
+		else :; fi;\
+	done
+
+install-examples:
+
+install-doc:
+



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-23 14:54 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-23 14:54 UTC (permalink / raw
  To: gentoo-commits

commit:     2ba3b0423b9dbbd87a2fac972311578bffb7b4bb
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 14:50:19 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 14:50:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=2ba3b042

Fix locations.

---
 dev-util/ati-stream-sdk/Manifest                   |    4 ++--
 .../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild    |    4 ++--
 dev-util/ati-stream-sdk/files/Makefile             |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 048078b..86e7709 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,6 +1,6 @@
-AUX Makefile 1741 RMD160 de6d4123c6e990c930fd1fc5c6ebd79569000f8b SHA1 819430cc79c3784f140110871ec067869edff5a6 SHA256 725ebe9c0fb678c02c61b644c1678c39ff79f1c6d53fe9e3632bdbc7a806f3a4
+AUX Makefile 1756 RMD160 59626766f44c60c064baf25817f11fa51fa7a43b SHA1 da033443bad9eb870bdd6023cfe8ed3e7ae9e173 SHA256 40372466777f3e9269e2ea8a54b3ad2906a8f64299568cecfb56be574e7a1064
 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 1538 RMD160 3502b693551666c4ba3ccff46f6fe3102ab24427 SHA1 4045b9d514c9d848ad5d20e6769f227ad98535b3 SHA256 3d635640e522688b0ff096c7b644a52c5e60f2577c6f796d1fa9cef4737d07de
+EBUILD ati-stream-sdk-2.3-r1.ebuild 1542 RMD160 6b8160c30fb2b88a839e46ee39968c7b0562b1aa SHA1 15c8dfd0079e7fbd70608c284b47240f5400b536 SHA256 3751f17bce97bf92325d661f182ef8cda701ffa096d31706d249254751a1a8d2
 EBUILD ati-stream-sdk-2.3.ebuild 1902 RMD160 3223fecbf191d822e896965ba63be3ebb2475d1e SHA1 b30d65c95630319b86c0b7a4fe5cd22323379093 SHA256 1f55cff88074875c4867fd52441fd266fbc3ab96016865f93eb21a4a07598948
 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 a09eb35..2582076 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
@@ -47,9 +47,9 @@ src_install() {
 	rm include/GL/{glext.h,glut.h} || die
 
 	if use amd64; then
-		emake DESTDIR=${D} ARCH="amd64" install;
+		emake DESTDIR="${D}" ARCH="amd64" install;
 	else
-		emake DESTDIR=${D} install-x86;
+		emake DESTDIR="${D}" install-x86;
 	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 f226f4b..ae36468 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -1,5 +1,5 @@
 DESTDIR=
-PREFIX=$(DESTDIR)/opt/
+PREFIX=$(DESTDIR)/opt/ati-stream-sdk/
 LIBDIR=$(PREFIX)lib/
 BINDIR=$(PREFIX)bin/
 INCDIR=$(PREFIX)include/



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-23 15:58 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-23 15:58 UTC (permalink / raw
  To: gentoo-commits

commit:     9c197d34c69068f5729c7f1ace16ee0c54e6ab9f
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 15:54:15 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 15:54:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=9c197d34

Fix makefile.

---
 dev-util/ati-stream-sdk/Manifest       |    3 ++-
 dev-util/ati-stream-sdk/files/Makefile |   15 +++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index fe7287f..a4e667f 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,4 +1,5 @@
-AUX Makefile 1756 RMD160 59626766f44c60c064baf25817f11fa51fa7a43b SHA1 da033443bad9eb870bdd6023cfe8ed3e7ae9e173 SHA256 40372466777f3e9269e2ea8a54b3ad2906a8f64299568cecfb56be574e7a1064
+AUX Makefile 1701 RMD160 d77ac41fc9c2487af57b8b2fd5d5bbc754e0770e SHA1 a85e86cd5a94dae546508ac8de16ad417d380ec0 SHA256 50e2defb2c842b80922abb078fc8a38c071dc1fed6c7e780af11db52bb266576
+AUX Makefile.old 1756 RMD160 59626766f44c60c064baf25817f11fa51fa7a43b SHA1 da033443bad9eb870bdd6023cfe8ed3e7ae9e173 SHA256 40372466777f3e9269e2ea8a54b3ad2906a8f64299568cecfb56be574e7a1064
 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 1692 RMD160 a2acb27a3b095ff67427243f9eef5b11cccff482 SHA1 e471885ebd5ddb249c8f20ee167ee610203178df SHA256 7d2637c6013f7b1a4629d897de299bccac48bda5577362c6fb9f43a1fb026dce

diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index ae36468..5396f6f 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -12,8 +12,7 @@ MKDIR=mkdir -p
 ARCH:=x86
 BINFILES=bin/x86$(DSUFX)/clc 
 LIBFILES=lib/x86$(DSUFX)/libOpenCL.so lib/x86$(DSUFX)/libatiolc$(SUFX).so lib/x86$(DSUFX)/libGLEW.so lib/gpu/builtins-7xx.bc lib/gpu/builtins-evergreen.bc lib/gpu/builtins-gpucommon.bc lib/x86$(DSUFX)/builtins-x86$(DSUFX).bc
-INCDIRS=include/CL include/GL include/OVDecode
-INCFILES=include/cal*.h
+INCFILES=include/cal*.h include/CL/* include/GL/* include/OVDecode/*
 
 ifeq ($(ARCH),amd64)
 DSUFX=_64
@@ -44,16 +43,12 @@ install:
 			$(INSTALLBIN) "$$f" "$(LIBDIR)$$f1" || exit 1;\
 		else :; fi;\
 	done
-	@list='$(INCDIRS)'; for f in $$list; do\
-		if test -d $$f; then\
-			f1=`basename $$f`;\
-			echo "$(INSTALLDIR) $$f $(INCDIR)$$f1";\
-			$(INSTALLDIR) $$f $(INCDIR)$$f1 || exit 1;\
-		else :; fi;\
-	done
 	@list='$(INCFILES)'; for f in $$list; do\
 		if test -f $$f; then\
-			f1=`basename $$f`;\
+			f1=`echo $$f | sed -e 's|include||g'`;\
+			base=`basename $$f1`;\
+			dir=`echo $$f1 | sed -e "s|$$base||g`;\
+			test -z "$(INCDIR)$$dir" || $(MKDIR) "$(INCDIR)$$dir";\
 			echo "$(INSTALLDAT) $$f $(INCDIR)$$f1";\
 			$(INSTALLDAT) $$f $(INCDIR)$$f1 || exit 1;\
 		else :; fi;\



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-23 16:02 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-23 16:02 UTC (permalink / raw
  To: gentoo-commits

commit:     4bc0a17bbfdbd61543838afd7507c148ef11216c
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 15:57:29 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 15:57:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=4bc0a17b

Typo Makefile

---
 dev-util/ati-stream-sdk/Manifest       |    2 +-
 dev-util/ati-stream-sdk/files/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 2c7076f..52ed488 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,4 +1,4 @@
-AUX Makefile 1701 RMD160 d77ac41fc9c2487af57b8b2fd5d5bbc754e0770e SHA1 a85e86cd5a94dae546508ac8de16ad417d380ec0 SHA256 50e2defb2c842b80922abb078fc8a38c071dc1fed6c7e780af11db52bb266576
+AUX Makefile 1702 RMD160 900cbc58cb5ae1d7df48919e981ed310c3418d5e SHA1 8752ad75e75b38b41f920b7ca03eda066ff9be82 SHA256 b3b38e9ba2d3ff961d8bb0990ecf014b16c05d23af1c52d5b7acb3cb3721e6e8
 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 1692 RMD160 a2acb27a3b095ff67427243f9eef5b11cccff482 SHA1 e471885ebd5ddb249c8f20ee167ee610203178df SHA256 7d2637c6013f7b1a4629d897de299bccac48bda5577362c6fb9f43a1fb026dce

diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index 5396f6f..544deae 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -47,7 +47,7 @@ install:
 		if test -f $$f; then\
 			f1=`echo $$f | sed -e 's|include||g'`;\
 			base=`basename $$f1`;\
-			dir=`echo $$f1 | sed -e "s|$$base||g`;\
+			dir=`echo $$f1 | sed -e "s|$$base||g"`;\
 			test -z "$(INCDIR)$$dir" || $(MKDIR) "$(INCDIR)$$dir";\
 			echo "$(INSTALLDAT) $$f $(INCDIR)$$f1";\
 			$(INSTALLDAT) $$f $(INCDIR)$$f1 || exit 1;\



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-23 16:34 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-23 16:34 UTC (permalink / raw
  To: gentoo-commits

commit:     1d8aa7d242f659ba1b7a84c858008265cceddd65
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 16:30:07 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 16:30:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=1d8aa7d2

Typo in makefile. Fix ebuild.

---
 dev-util/ati-stream-sdk/Manifest                   |    4 ++--
 .../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild    |    5 +++--
 dev-util/ati-stream-sdk/files/Makefile             |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 52ed488..b80f176 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,6 +1,6 @@
-AUX Makefile 1702 RMD160 900cbc58cb5ae1d7df48919e981ed310c3418d5e SHA1 8752ad75e75b38b41f920b7ca03eda066ff9be82 SHA256 b3b38e9ba2d3ff961d8bb0990ecf014b16c05d23af1c52d5b7acb3cb3721e6e8
+AUX Makefile 1702 RMD160 7e00d6e87f13632a35c7c0b497ca5dc8d9727071 SHA1 06953c67d2d3d824bb77b7d5e9cc9ba72764b093 SHA256 24bb9a328d01746fc0f67774b6ebb792754618a78c0090fc7b414d91c290d107
 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 1692 RMD160 a2acb27a3b095ff67427243f9eef5b11cccff482 SHA1 e471885ebd5ddb249c8f20ee167ee610203178df SHA256 7d2637c6013f7b1a4629d897de299bccac48bda5577362c6fb9f43a1fb026dce
+EBUILD ati-stream-sdk-2.3-r1.ebuild 1786 RMD160 de6c2db9cf685c43b31b3748a77b1cc1740b8eb2 SHA1 35c2e28b3b69934bfde2efba4ba10c42f7127809 SHA256 4b27bcdc75f23eef56b3141d0d08b5ad80d780c56ed545dbfa5b9c4a60e28c8b
 EBUILD ati-stream-sdk-2.3.ebuild 1902 RMD160 3223fecbf191d822e896965ba63be3ebb2475d1e SHA1 b30d65c95630319b86c0b7a4fe5cd22323379093 SHA256 1f55cff88074875c4867fd52441fd266fbc3ab96016865f93eb21a4a07598948
 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 c9b22e9..e0528e6 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
@@ -54,15 +54,16 @@ src_install() {
 	rm include/GL/{glext.h,glut.h} || die
 
 	if use amd64; then
-		emake DESTDIR="${D}" ARCH="amd64" install;
+		emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed";
 	else
-		emake DESTDIR="${D}" install-x86;
+		emake DESTDIR="${D}" ARCH="x86" install || die "Install failed";
 	fi
 
 	cat > "${T}/99${PN}" << EOF
 PATH=${DEST}/bin
 ROOTPATH=${DEST}/bin
 LDPATH=${DEST}/$(get_libdir)
+LD_LIBRARY_PATH="${DEST}/$(get_libdir)
 EOF
 	doenvd "${T}/99${PN}"
 

diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index 544deae..dc0172f 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -11,7 +11,7 @@ MKDIR=mkdir -p
 
 ARCH:=x86
 BINFILES=bin/x86$(DSUFX)/clc 
-LIBFILES=lib/x86$(DSUFX)/libOpenCL.so lib/x86$(DSUFX)/libatiolc$(SUFX).so lib/x86$(DSUFX)/libGLEW.so lib/gpu/builtins-7xx.bc lib/gpu/builtins-evergreen.bc lib/gpu/builtins-gpucommon.bc lib/x86$(DSUFX)/builtins-x86$(DSUFX).bc
+LIBFILES=lib/x86$(DSUFX)/libOpenCL.so lib/x86$(DSUFX)/libatiocl$(SUFX).so lib/x86$(DSUFX)/libGLEW.so lib/gpu/builtins-7xx.bc lib/gpu/builtins-evergreen.bc lib/gpu/builtins-gpucommon.bc lib/x86$(DSUFX)/builtins-x86$(DSUFX).bc
 INCFILES=include/cal*.h include/CL/* include/GL/* include/OVDecode/*
 
 ifeq ($(ARCH),amd64)



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-23 17:52 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-23 17:52 UTC (permalink / raw
  To: gentoo-commits

commit:     ab57dfb5fbab7c7b5b9b74db461e04998ebe26bf
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 17:47:53 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 17:47:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=ab57dfb5

Fixed makefile. Install etc files.

---
 dev-util/ati-stream-sdk/Manifest       |    2 +-
 dev-util/ati-stream-sdk/files/Makefile |   14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index dc05f00..0c34fce 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,4 +1,4 @@
-AUX Makefile 1702 RMD160 7e00d6e87f13632a35c7c0b497ca5dc8d9727071 SHA1 06953c67d2d3d824bb77b7d5e9cc9ba72764b093 SHA256 24bb9a328d01746fc0f67774b6ebb792754618a78c0090fc7b414d91c290d107
+AUX Makefile 2206 RMD160 75f1ebb649aa8111e750c75b03452c7df9ffae5d SHA1 0644e3c66b2801e4cfe0663a4a81aa148d7360e8 SHA256 70ff4dbcbcd759babce9a1eb9fa355c7797116753e8f356eaaef1cea3469bf44
 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

diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index dc0172f..1052039 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -3,6 +3,7 @@ PREFIX=$(DESTDIR)/opt/ati-stream-sdk/
 LIBDIR=$(PREFIX)lib/
 BINDIR=$(PREFIX)bin/
 INCDIR=$(PREFIX)include/
+ETCDIR=$(DESTDIR)etc/
 
 INSTALLBIN=install
 INSTALLDAT=install -m0644
@@ -13,6 +14,7 @@ ARCH:=x86
 BINFILES=bin/x86$(DSUFX)/clc 
 LIBFILES=lib/x86$(DSUFX)/libOpenCL.so lib/x86$(DSUFX)/libatiocl$(SUFX).so lib/x86$(DSUFX)/libGLEW.so lib/gpu/builtins-7xx.bc lib/gpu/builtins-evergreen.bc lib/gpu/builtins-gpucommon.bc lib/x86$(DSUFX)/builtins-x86$(DSUFX).bc
 INCFILES=include/cal*.h include/CL/* include/GL/* include/OVDecode/*
+ETCFILES=etc/OpenCL/vendors/atiocl$(SUFX).icd
 
 ifeq ($(ARCH),amd64)
 DSUFX=_64
@@ -26,6 +28,18 @@ install:
 	test -z "$(BINDIR)" || $(MKDIR) "$(BINDIR)"
 	test -z "$(LIBDIR)" || $(MKDIR) "$(LIBDIR)"
 	test -z "$(INCDIR)" || $(MKDIR) "$(INCDIR)"
+	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
 	@list='$(BINFILES)'; for f in $$list; do\
 		if test -f $$f; then\
 			f1=`basename $$f`;\



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-23 18:05 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-23 18:05 UTC (permalink / raw
  To: gentoo-commits

commit:     aecc2d54508d10901b38e3c317bb47da987bef5c
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 18:00:41 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 18:00:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=aecc2d54

Updated version. Cleaned makefile.

---
 dev-util/ati-stream-sdk/Manifest                  |    3 +-
 dev-util/ati-stream-sdk/ati-stream-sdk-2.3.ebuild |   82 ---------------------
 dev-util/ati-stream-sdk/files/Makefile            |   19 +++--
 3 files changed, 12 insertions(+), 92 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 0c34fce..735dde4 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,6 +1,5 @@
-AUX Makefile 2206 RMD160 75f1ebb649aa8111e750c75b03452c7df9ffae5d SHA1 0644e3c66b2801e4cfe0663a4a81aa148d7360e8 SHA256 70ff4dbcbcd759babce9a1eb9fa355c7797116753e8f356eaaef1cea3469bf44
+AUX Makefile 2284 RMD160 88e0aa563e687c03219676b95c9f464093a7f4be SHA1 517c1088e3917f6a8f8b6358df7de2d964beb192 SHA256 2c6b248be818dc05dd0047cd92f0beaab6ac42689cce858f9d8b9dcd1fe5de3d
 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.ebuild 1902 RMD160 3223fecbf191d822e896965ba63be3ebb2475d1e SHA1 b30d65c95630319b86c0b7a4fe5cd22323379093 SHA256 1f55cff88074875c4867fd52441fd266fbc3ab96016865f93eb21a4a07598948
 MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SHA1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a736b9a5b3f1d8ea110446c18e988a3b884d0dca33b7

diff --git a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3.ebuild b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3.ebuild
deleted file mode 100644
index b5fbd23..0000000
--- a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit eutils multilib
-
-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 GPL-1 as-is"
-SLOT="0"
-KEYWORDS=""
-IUSE="examples doc multilib"
-RESTRICT="strip fetch"
-RDEPEND="media-libs/freeglut
-	x11-drivers/ati-drivers
-	examples? ( media-libs/glew )"
-
-QA_EXECSTACK="opt/${PN}/lib*/libatiocl??.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
-}
-
-src_compile() { true; }
-
-src_install() {
-	local DEST=/opt/${PN}
-
-	rm include/GL/{glext.h,glut.h} || die
-
-	into ${DEST}
-	if use amd64; then
-		dobin bin/x86_64/* || die
-		dolib.so lib/x86_64/{libOpenCL.so,libatiocl64.so,libGLEW.so} || die
-	else
-		dobin bin/x86/* || die
-		dolib.so lib/x86/{libOpenCL.so,libatiocl32.so,libGLEW.so} || die
-	fi
-
-	insinto ${DEST}/$(get_libdir)
-	insopts -m0755
-	doins -r lib/gpu || die
-	insinto ${DEST}/include/
-	doins -r include/CL include/GL include/OVDecode include/cal*.h || die
-	use amd64 && (doins lib/x86_64/builtins-x86_64.bc || die)
-	use x86 && (doins lib/x86/builtins-x86.bc || die)
-
-	cat > "${T}/99${PN}" << EOF
-PATH=${DEST}/bin
-ROOTPATH=${DEST}/bin
-LDPATH=${DEST}/$(get_libdir)
-EOF
-	doenvd "${T}/99${PN}"
-
-	if use examples; then
-		insinto ${DEST}/exmaples
-		doins -r samples/* || die
-		insinto ${DEST}
-		doins -r make || die
-	fi
-
-	if use doc; then
-		dodoc docs/opencl/*
-	fi
-}

diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index 1052039..9828850 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -24,10 +24,7 @@ DSUFX=
 SUFX=32
 endif
 
-install:
-	test -z "$(BINDIR)" || $(MKDIR) "$(BINDIR)"
-	test -z "$(LIBDIR)" || $(MKDIR) "$(LIBDIR)"
-	test -z "$(INCDIR)" || $(MKDIR) "$(INCDIR)"
+install-etc:
 	test -z "$(ETCDIR)" || $(MKDIR) "$(ETCDIR)"
 	tar -xzf icd-registration.tgz || exit 1
 	@list='$(ETCFILES)'; for f in $$list; do\
@@ -40,6 +37,9 @@ install:
 			$(INSTALLDAT) "$$f" $(ETCDIR)$$f1 || exit 1;\
 		else :; fi;\
 	done
+
+install-bin:
+	test -z "$(BINDIR)" || $(MKDIR) "$(BINDIR)"
 	@list='$(BINFILES)'; for f in $$list; do\
 		if test -f $$f; then\
 			f1=`basename $$f`;\
@@ -47,6 +47,9 @@ install:
 			$(INSTALLBIN) "$$f" "$(BINDIR)$$f1" || exit 1;\
 		else :; fi;\
 	done
+
+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'`;\
@@ -57,6 +60,9 @@ install:
 			$(INSTALLBIN) "$$f" "$(LIBDIR)$$f1" || exit 1;\
 		else :; fi;\
 	done
+
+install-include:
+	test -z "$(INCDIR)" || $(MKDIR) "$(INCDIR)"
 	@list='$(INCFILES)'; for f in $$list; do\
 		if test -f $$f; then\
 			f1=`echo $$f | sed -e 's|include||g'`;\
@@ -68,7 +74,4 @@ install:
 		else :; fi;\
 	done
 
-install-examples:
-
-install-doc:
-
+install: install-etc install-bin install-lib install-include



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-23 18:21 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-23 18:21 UTC (permalink / raw
  To: gentoo-commits

commit:     2d5c8e8dc3ab5e5afd486bdcd3bc53833849de36
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 18:16:29 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 18:16:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=2d5c8e8d

Multilib+

---
 dev-util/ati-stream-sdk/Manifest                   |    4 +-
 .../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild    |    8 ++++-
 dev-util/ati-stream-sdk/files/Makefile             |   32 ++++++++++----------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 735dde4..f39b6a1 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,5 +1,5 @@
-AUX Makefile 2284 RMD160 88e0aa563e687c03219676b95c9f464093a7f4be SHA1 517c1088e3917f6a8f8b6358df7de2d964beb192 SHA256 2c6b248be818dc05dd0047cd92f0beaab6ac42689cce858f9d8b9dcd1fe5de3d
+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 1991 RMD160 b4d164ea0df067c366e334c3d2259dea9cb589b2 SHA1 a20ba92ac7d2fbe271c59ea2f8381cdfc9eabfc0 SHA256 d26ae0d006297e2819c5b6a8806d9797d381098a6036a3b329f9b6e333f48738
 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..d8ca9c6 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
@@ -54,9 +54,13 @@ src_install() {
 	rm include/GL/{glext.h,glut.h} || die
 
 	if use amd64; then
-		emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed";
+		emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
+		if use multilib; then
+			emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \
+				install-lib || die "Install multilib failed"
+		fi
 	else
-		emake DESTDIR="${D}" ARCH="x86" install || die "Install failed";
+		emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
 	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 9828850..d5bbb83 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -1,9 +1,9 @@
 DESTDIR=
-PREFIX=$(DESTDIR)/opt/ati-stream-sdk/
-LIBDIR=$(PREFIX)lib/
-BINDIR=$(PREFIX)bin/
-INCDIR=$(PREFIX)include/
-ETCDIR=$(DESTDIR)etc/
+PREFIX=$(DESTDIR)/opt/ati-stream-sdk
+LIBDIR=$(PREFIX)/lib
+BINDIR=$(PREFIX)/bin
+INCDIR=$(PREFIX)/include
+ETCDIR=$(DESTDIR)/etc
 
 INSTALLBIN=install
 INSTALLDAT=install -m0644
@@ -32,9 +32,9 @@ install-etc:
 			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;\
+			test -z "$(ETCDIR)/$$dir" || $(MKDIR) "$(ETCDIR)/$$dir";\
+			echo "$(INSTALLDAT) $$f $(ETCDIR)/$$f1";\
+			$(INSTALLDAT) "$$f" $(ETCDIR)/$$f1 || exit 1;\
 		else :; fi;\
 	done
 
@@ -43,8 +43,8 @@ install-bin:
 	@list='$(BINFILES)'; for f in $$list; do\
 		if test -f $$f; then\
 			f1=`basename $$f`;\
-			echo "$(INSTALLBIN) $$f $(BINDIR)$$f1";\
-			$(INSTALLBIN) "$$f" "$(BINDIR)$$f1" || exit 1;\
+			echo "$(INSTALLBIN) $$f $(BINDIR)/$$f1";\
+			$(INSTALLBIN) "$$f" "$(BINDIR)/$$f1" || exit 1;\
 		else :; fi;\
 	done
 
@@ -55,9 +55,9 @@ install-lib:
 			f1=`echo $$f | sed -e 's|lib/||g' -e 's|x86*/||g'`;\
 			base=`basename $$f1`;\
 			dir=`echo $$f1 | sed -e "s|$$base||g"`;\
-			test -z "$(LIBDIR)$$dir" || $(MKDIR) "$(LIBDIR)$$dir";\
-			echo "$(INSTALLBIN) $$f $(LIBDIR)$$f1";\
-			$(INSTALLBIN) "$$f" "$(LIBDIR)$$f1" || exit 1;\
+			test -z "$(LIBDIR)/$$dir" || $(MKDIR) "$(LIBDIR)/$$dir";\
+			echo "$(INSTALLBIN) $$f $(LIBDIR)/$$f1";\
+			$(INSTALLBIN) "$$f" "$(LIBDIR)/$$f1" || exit 1;\
 		else :; fi;\
 	done
 
@@ -68,9 +68,9 @@ install-include:
 			f1=`echo $$f | sed -e 's|include||g'`;\
 			base=`basename $$f1`;\
 			dir=`echo $$f1 | sed -e "s|$$base||g"`;\
-			test -z "$(INCDIR)$$dir" || $(MKDIR) "$(INCDIR)$$dir";\
-			echo "$(INSTALLDAT) $$f $(INCDIR)$$f1";\
-			$(INSTALLDAT) $$f $(INCDIR)$$f1 || exit 1;\
+			test -z "$(INCDIR)/$$dir" || $(MKDIR) "$(INCDIR)/$$dir";\
+			echo "$(INSTALLDAT) $$f $(INCDIR)/$$f1";\
+			$(INSTALLDAT) $$f $(INCDIR)/$$f1 || exit 1;\
 		else :; fi;\
 	done
 



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-23 18:46 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-23 18:46 UTC (permalink / raw
  To: gentoo-commits

commit:     aa7b6b6b6ccbb8748084982b096b74072c8dfc75
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 18:41:29 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 18:41:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=aa7b6b6b

Fixed makefile. Regex in sed now works.

---
 dev-util/ati-stream-sdk/Manifest       |    2 +-
 dev-util/ati-stream-sdk/files/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index f39b6a1..a3913a4 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,4 +1,4 @@
-AUX Makefile 2297 RMD160 cb547b9644ae1f1e013f5627fca57d1b47173cde SHA1 8c7308662ab9ba793c285d5fe6a14b8262875c59 SHA256 17fddeaea2c5d94ed0ee01bf4317a9f20f141ea68a92f78ae4c8b7a36fc6c9bd
+AUX Makefile 2303 RMD160 60c8f2756550189262ee24714124a40f6369be8e SHA1 c4ae39fc81dfde80b62b876efe6b3540ff7422d9 SHA256 cdf4365663d68c898646c5544e280372214fcabf91115254342af432c3aac857
 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 1991 RMD160 b4d164ea0df067c366e334c3d2259dea9cb589b2 SHA1 a20ba92ac7d2fbe271c59ea2f8381cdfc9eabfc0 SHA256 d26ae0d006297e2819c5b6a8806d9797d381098a6036a3b329f9b6e333f48738

diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index d5bbb83..95fc754 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -52,7 +52,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' -e "s|x86[_0-9]*/||g"`;\
 			base=`basename $$f1`;\
 			dir=`echo $$f1 | sed -e "s|$$base||g"`;\
 			test -z "$(LIBDIR)/$$dir" || $(MKDIR) "$(LIBDIR)/$$dir";\



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-24 15:03 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-24 15:03 UTC (permalink / raw
  To: gentoo-commits

commit:     01788e8f6bd707e73c7a3c3bd2632bf7d4c86f30
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 14:58:52 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 14:58:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=01788e8f

Revert makefile.

---
 dev-util/ati-stream-sdk/Manifest       |    2 +-
 dev-util/ati-stream-sdk/files/Makefile |   53 +++++++++++++++-----------------
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 542b5d3..f22c302 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,4 +1,4 @@
-AUX Makefile 2303 RMD160 60c8f2756550189262ee24714124a40f6369be8e SHA1 c4ae39fc81dfde80b62b876efe6b3540ff7422d9 SHA256 cdf4365663d68c898646c5544e280372214fcabf91115254342af432c3aac857
+AUX Makefile 2206 RMD160 75f1ebb649aa8111e750c75b03452c7df9ffae5d SHA1 0644e3c66b2801e4cfe0663a4a81aa148d7360e8 SHA256 70ff4dbcbcd759babce9a1eb9fa355c7797116753e8f356eaaef1cea3469bf44
 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

diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index 95fc754..1052039 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -1,9 +1,9 @@
 DESTDIR=
-PREFIX=$(DESTDIR)/opt/ati-stream-sdk
-LIBDIR=$(PREFIX)/lib
-BINDIR=$(PREFIX)/bin
-INCDIR=$(PREFIX)/include
-ETCDIR=$(DESTDIR)/etc
+PREFIX=$(DESTDIR)/opt/ati-stream-sdk/
+LIBDIR=$(PREFIX)lib/
+BINDIR=$(PREFIX)bin/
+INCDIR=$(PREFIX)include/
+ETCDIR=$(DESTDIR)etc/
 
 INSTALLBIN=install
 INSTALLDAT=install -m0644
@@ -24,7 +24,10 @@ DSUFX=
 SUFX=32
 endif
 
-install-etc:
+install:
+	test -z "$(BINDIR)" || $(MKDIR) "$(BINDIR)"
+	test -z "$(LIBDIR)" || $(MKDIR) "$(LIBDIR)"
+	test -z "$(INCDIR)" || $(MKDIR) "$(INCDIR)"
 	test -z "$(ETCDIR)" || $(MKDIR) "$(ETCDIR)"
 	tar -xzf icd-registration.tgz || exit 1
 	@list='$(ETCFILES)'; for f in $$list; do\
@@ -32,46 +35,40 @@ install-etc:
 			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;\
+			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\
 		if test -f $$f; then\
 			f1=`basename $$f`;\
-			echo "$(INSTALLBIN) $$f $(BINDIR)/$$f1";\
-			$(INSTALLBIN) "$$f" "$(BINDIR)/$$f1" || exit 1;\
+			echo "$(INSTALLBIN) $$f $(BINDIR)$$f1";\
+			$(INSTALLBIN) "$$f" "$(BINDIR)$$f1" || exit 1;\
 		else :; fi;\
 	done
-
-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[_0-9]*/||g"`;\
+			f1=`echo $$f | sed -e 's|lib/||g' -e 's|x86*/||g'`;\
 			base=`basename $$f1`;\
 			dir=`echo $$f1 | sed -e "s|$$base||g"`;\
-			test -z "$(LIBDIR)/$$dir" || $(MKDIR) "$(LIBDIR)/$$dir";\
-			echo "$(INSTALLBIN) $$f $(LIBDIR)/$$f1";\
-			$(INSTALLBIN) "$$f" "$(LIBDIR)/$$f1" || exit 1;\
+			test -z "$(LIBDIR)$$dir" || $(MKDIR) "$(LIBDIR)$$dir";\
+			echo "$(INSTALLBIN) $$f $(LIBDIR)$$f1";\
+			$(INSTALLBIN) "$$f" "$(LIBDIR)$$f1" || exit 1;\
 		else :; fi;\
 	done
-
-install-include:
-	test -z "$(INCDIR)" || $(MKDIR) "$(INCDIR)"
 	@list='$(INCFILES)'; for f in $$list; do\
 		if test -f $$f; then\
 			f1=`echo $$f | sed -e 's|include||g'`;\
 			base=`basename $$f1`;\
 			dir=`echo $$f1 | sed -e "s|$$base||g"`;\
-			test -z "$(INCDIR)/$$dir" || $(MKDIR) "$(INCDIR)/$$dir";\
-			echo "$(INSTALLDAT) $$f $(INCDIR)/$$f1";\
-			$(INSTALLDAT) $$f $(INCDIR)/$$f1 || exit 1;\
+			test -z "$(INCDIR)$$dir" || $(MKDIR) "$(INCDIR)$$dir";\
+			echo "$(INSTALLDAT) $$f $(INCDIR)$$f1";\
+			$(INSTALLDAT) $$f $(INCDIR)$$f1 || exit 1;\
 		else :; fi;\
 	done
 
-install: install-etc install-bin install-lib install-include
+install-examples:
+
+install-doc:
+



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-24 15:09 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-24 15:09 UTC (permalink / raw
  To: gentoo-commits

commit:     695370a94d9797faa8a7be909b5a9f761a66ab0c
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 15:04:41 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 15:04:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=695370a9

Move forward 1 commit.

---
 dev-util/ati-stream-sdk/Manifest       |    2 +-
 dev-util/ati-stream-sdk/files/Makefile |   19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index f22c302..735dde4 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,4 +1,4 @@
-AUX Makefile 2206 RMD160 75f1ebb649aa8111e750c75b03452c7df9ffae5d SHA1 0644e3c66b2801e4cfe0663a4a81aa148d7360e8 SHA256 70ff4dbcbcd759babce9a1eb9fa355c7797116753e8f356eaaef1cea3469bf44
+AUX Makefile 2284 RMD160 88e0aa563e687c03219676b95c9f464093a7f4be SHA1 517c1088e3917f6a8f8b6358df7de2d964beb192 SHA256 2c6b248be818dc05dd0047cd92f0beaab6ac42689cce858f9d8b9dcd1fe5de3d
 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

diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index 1052039..9828850 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -24,10 +24,7 @@ DSUFX=
 SUFX=32
 endif
 
-install:
-	test -z "$(BINDIR)" || $(MKDIR) "$(BINDIR)"
-	test -z "$(LIBDIR)" || $(MKDIR) "$(LIBDIR)"
-	test -z "$(INCDIR)" || $(MKDIR) "$(INCDIR)"
+install-etc:
 	test -z "$(ETCDIR)" || $(MKDIR) "$(ETCDIR)"
 	tar -xzf icd-registration.tgz || exit 1
 	@list='$(ETCFILES)'; for f in $$list; do\
@@ -40,6 +37,9 @@ install:
 			$(INSTALLDAT) "$$f" $(ETCDIR)$$f1 || exit 1;\
 		else :; fi;\
 	done
+
+install-bin:
+	test -z "$(BINDIR)" || $(MKDIR) "$(BINDIR)"
 	@list='$(BINFILES)'; for f in $$list; do\
 		if test -f $$f; then\
 			f1=`basename $$f`;\
@@ -47,6 +47,9 @@ install:
 			$(INSTALLBIN) "$$f" "$(BINDIR)$$f1" || exit 1;\
 		else :; fi;\
 	done
+
+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'`;\
@@ -57,6 +60,9 @@ install:
 			$(INSTALLBIN) "$$f" "$(LIBDIR)$$f1" || exit 1;\
 		else :; fi;\
 	done
+
+install-include:
+	test -z "$(INCDIR)" || $(MKDIR) "$(INCDIR)"
 	@list='$(INCFILES)'; for f in $$list; do\
 		if test -f $$f; then\
 			f1=`echo $$f | sed -e 's|include||g'`;\
@@ -68,7 +74,4 @@ install:
 		else :; fi;\
 	done
 
-install-examples:
-
-install-doc:
-
+install: install-etc install-bin install-lib install-include



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-24 15:15 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-24 15:15 UTC (permalink / raw
  To: gentoo-commits

commit:     ca9cd1e1fd06f2f01ea87b96c069b5d5c354b6b9
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 15:10:46 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 15:10:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=ca9cd1e1

And again

---
 dev-util/ati-stream-sdk/Manifest       |    2 +-
 dev-util/ati-stream-sdk/files/Makefile |   32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 735dde4..fa28365 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,4 +1,4 @@
-AUX Makefile 2284 RMD160 88e0aa563e687c03219676b95c9f464093a7f4be SHA1 517c1088e3917f6a8f8b6358df7de2d964beb192 SHA256 2c6b248be818dc05dd0047cd92f0beaab6ac42689cce858f9d8b9dcd1fe5de3d
+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

diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index 9828850..d5bbb83 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -1,9 +1,9 @@
 DESTDIR=
-PREFIX=$(DESTDIR)/opt/ati-stream-sdk/
-LIBDIR=$(PREFIX)lib/
-BINDIR=$(PREFIX)bin/
-INCDIR=$(PREFIX)include/
-ETCDIR=$(DESTDIR)etc/
+PREFIX=$(DESTDIR)/opt/ati-stream-sdk
+LIBDIR=$(PREFIX)/lib
+BINDIR=$(PREFIX)/bin
+INCDIR=$(PREFIX)/include
+ETCDIR=$(DESTDIR)/etc
 
 INSTALLBIN=install
 INSTALLDAT=install -m0644
@@ -32,9 +32,9 @@ install-etc:
 			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;\
+			test -z "$(ETCDIR)/$$dir" || $(MKDIR) "$(ETCDIR)/$$dir";\
+			echo "$(INSTALLDAT) $$f $(ETCDIR)/$$f1";\
+			$(INSTALLDAT) "$$f" $(ETCDIR)/$$f1 || exit 1;\
 		else :; fi;\
 	done
 
@@ -43,8 +43,8 @@ install-bin:
 	@list='$(BINFILES)'; for f in $$list; do\
 		if test -f $$f; then\
 			f1=`basename $$f`;\
-			echo "$(INSTALLBIN) $$f $(BINDIR)$$f1";\
-			$(INSTALLBIN) "$$f" "$(BINDIR)$$f1" || exit 1;\
+			echo "$(INSTALLBIN) $$f $(BINDIR)/$$f1";\
+			$(INSTALLBIN) "$$f" "$(BINDIR)/$$f1" || exit 1;\
 		else :; fi;\
 	done
 
@@ -55,9 +55,9 @@ install-lib:
 			f1=`echo $$f | sed -e 's|lib/||g' -e 's|x86*/||g'`;\
 			base=`basename $$f1`;\
 			dir=`echo $$f1 | sed -e "s|$$base||g"`;\
-			test -z "$(LIBDIR)$$dir" || $(MKDIR) "$(LIBDIR)$$dir";\
-			echo "$(INSTALLBIN) $$f $(LIBDIR)$$f1";\
-			$(INSTALLBIN) "$$f" "$(LIBDIR)$$f1" || exit 1;\
+			test -z "$(LIBDIR)/$$dir" || $(MKDIR) "$(LIBDIR)/$$dir";\
+			echo "$(INSTALLBIN) $$f $(LIBDIR)/$$f1";\
+			$(INSTALLBIN) "$$f" "$(LIBDIR)/$$f1" || exit 1;\
 		else :; fi;\
 	done
 
@@ -68,9 +68,9 @@ install-include:
 			f1=`echo $$f | sed -e 's|include||g'`;\
 			base=`basename $$f1`;\
 			dir=`echo $$f1 | sed -e "s|$$base||g"`;\
-			test -z "$(INCDIR)$$dir" || $(MKDIR) "$(INCDIR)$$dir";\
-			echo "$(INSTALLDAT) $$f $(INCDIR)$$f1";\
-			$(INSTALLDAT) $$f $(INCDIR)$$f1 || exit 1;\
+			test -z "$(INCDIR)/$$dir" || $(MKDIR) "$(INCDIR)/$$dir";\
+			echo "$(INSTALLDAT) $$f $(INCDIR)/$$f1";\
+			$(INSTALLDAT) $$f $(INCDIR)/$$f1 || exit 1;\
 		else :; fi;\
 	done
 



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-24 15:27 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-24 15:27 UTC (permalink / raw
  To: gentoo-commits

commit:     f5bfd1114aae0ad278cd19b2a9588c911cb20f13
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 15:22:57 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 15:22:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=f5bfd111

Multilib attempt 2

---
 dev-util/ati-stream-sdk/Manifest                   |    4 ++--
 .../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild    |   17 ++++++++++++++---
 dev-util/ati-stream-sdk/files/Makefile             |    2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index fa28365..82631c4 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
+AUX Makefile 2303 RMD160 60c8f2756550189262ee24714124a40f6369be8e SHA1 c4ae39fc81dfde80b62b876efe6b3540ff7422d9 SHA256 cdf4365663d68c898646c5544e280372214fcabf91115254342af432c3aac857
 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 2235 RMD160 01df1a86a81e46ba20bb019cbabca48c00d7b5d1 SHA1 d77d458b1262d2aaf2eaeff7fc65520223248dcd SHA256 fc2d53b532334926195e1dff993015623321b7b3d18ebddfbc676cb66404318a
 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..44ad312 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
@@ -41,8 +41,15 @@ src_unpack() {
 
 src_prepare(){
 	if use examples; then
-		sed -i -e 's/samples/examples/g'  make/openclsdkrules.mk make/openclsdkdefs.mk\
+		sed -i -e 's/samples/examples/g'  make/openclsdkrules.mk make/openclsdkdefs.mk \
 			|| die "Sed failed"
+		sed -i \
+			-e "/OPENCL_LIBDIRS/{s|lib/\$(CPU_ARCH)|$(get_libdir)|}" \
+			-e "s|\$(DEPTH)/lib/\$(CPU_ARCH)|\$(DEPTH)/$(get_libdir)|" \
+#			-e "/CAL_LIBDIRS/{s|lib|$(get_libdir)|}" \
+			make/openclsdkdefs.mk || die "Sed failed"
+
+
 	fi
 }
 
@@ -54,9 +61,13 @@ src_install() {
 	rm include/GL/{glext.h,glut.h} || die
 
 	if use amd64; then
-		emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed";
+		emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
+		if use multilib; then
+			emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \
+				install-lib install-etc || die "Install multilib failed"
+		fi
 	else
-		emake DESTDIR="${D}" ARCH="x86" install || die "Install failed";
+		emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
 	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..95fc754 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -52,7 +52,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' -e "s|x86[_0-9]*/||g"`;\
 			base=`basename $$f1`;\
 			dir=`echo $$f1 | sed -e "s|$$base||g"`;\
 			test -z "$(LIBDIR)/$$dir" || $(MKDIR) "$(LIBDIR)/$$dir";\



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-24 15:48 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-24 15:48 UTC (permalink / raw
  To: gentoo-commits

commit:     1de1905ec6b32bc93920d518099f45a095cabb9e
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 15:43:20 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 15:43:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=1de1905e

Rearrange libraries.. again

---
 dev-util/ati-stream-sdk/Manifest       |    2 +-
 dev-util/ati-stream-sdk/files/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 8f587e1..776eecb 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,4 +1,4 @@
-AUX Makefile 2303 RMD160 60c8f2756550189262ee24714124a40f6369be8e SHA1 c4ae39fc81dfde80b62b876efe6b3540ff7422d9 SHA256 cdf4365663d68c898646c5544e280372214fcabf91115254342af432c3aac857
+AUX Makefile 2281 RMD160 610ca13cc6ef1274102baaacfc06671278b8a123 SHA1 9f7d59f04c4b92a8e4f2fdbea1ae71dd2d29bf3f SHA256 80c08f9ec8ad1bbb9e569bff547297baa9f25ae98b7b6641f886a1bf76012878
 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 2170 RMD160 d772d1fd4d56f67711c52eb33751d57c20c27ea2 SHA1 2b4145f73cecf210eea5fff18c6a4e3d77f5a190 SHA256 85945cc0e819ca317e6f1994ee134677ef6f0517c0d3092bff3b1a5ac8820688

diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index 95fc754..3fbacc6 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -52,7 +52,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[_0-9]*/||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";\



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-24 15:58 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-24 15:58 UTC (permalink / raw
  To: gentoo-commits

commit:     2b60f0aefbc363e97244a63377ef4c06bd1b8dba
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 15:53:52 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 15:53:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=2b60f0ae

Correct installation path.

---
 dev-util/ati-stream-sdk/Manifest                   |    4 ++--
 .../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild    |   13 +++++--------
 dev-util/ati-stream-sdk/files/Makefile             |    2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 7a983aa..8f587e1 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,5 +1,5 @@
-AUX Makefile 2281 RMD160 610ca13cc6ef1274102baaacfc06671278b8a123 SHA1 9f7d59f04c4b92a8e4f2fdbea1ae71dd2d29bf3f SHA256 80c08f9ec8ad1bbb9e569bff547297baa9f25ae98b7b6641f886a1bf76012878
+AUX Makefile 2303 RMD160 60c8f2756550189262ee24714124a40f6369be8e SHA1 c4ae39fc81dfde80b62b876efe6b3540ff7422d9 SHA256 cdf4365663d68c898646c5544e280372214fcabf91115254342af432c3aac857
 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 2326 RMD160 47620cba6c28417467a547d4932790582d4f0819 SHA1 a9261b2092a735b385554f327cd5291fd2268faf SHA256 6b241ce327b72f91d8776849ccf9a9269cd199b515f1bda4077c0b4160067e51
+EBUILD ati-stream-sdk-2.3-r1.ebuild 2170 RMD160 d772d1fd4d56f67711c52eb33751d57c20c27ea2 SHA1 2b4145f73cecf210eea5fff18c6a4e3d77f5a190 SHA256 85945cc0e819ca317e6f1994ee134677ef6f0517c0d3092bff3b1a5ac8820688
 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 c6b84d6..c7b3a8c 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
@@ -60,23 +60,20 @@ src_install() {
 	rm include/GL/{glext.h,glut.h} || die
 
 	if use amd64; then
-		#emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
-		emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed";
+		emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
 		if use multilib; then
-			#emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \
-			emake DESTDIR="${D}" ARCH="x86" \
+			emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \
 				install-lib install-etc || die "Install multilib failed"
 		fi
 	else
-		#emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
-		emake DESTDIR="${D}" ARCH="x86" install || die "Install failed";
+		emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
 	fi
 
 	cat > "${T}/99${PN}" << EOF
 PATH=${DEST}/bin
 ROOTPATH=${DEST}/bin
-LDPATH=${DEST}/lib
-LD_LIBRARY_PATH=${DEST}/lib
+LDPATH=${DEST}/$(get_libdir)
+LD_LIBRARY_PATH=${DEST}/$(get_libdir)
 EOF
 	doenvd "${T}/99${PN}"
 

diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index 3fbacc6..95fc754 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -52,7 +52,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'`;\
+			f1=`echo $$f | sed -e 's|lib/||g' -e "s|x86[_0-9]*/||g"`;\
 			base=`basename $$f1`;\
 			dir=`echo $$f1 | sed -e "s|$$base||g"`;\
 			test -z "$(LIBDIR)/$$dir" || $(MKDIR) "$(LIBDIR)/$$dir";\



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-24 16:43 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-24 16:43 UTC (permalink / raw
  To: gentoo-commits

commit:     f55e8479da068fdff01f5bbe06c3ca34c4ba882f
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 16:38:52 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:38:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=f55e8479

back to no multilib

---
 dev-util/ati-stream-sdk/Manifest                   |    4 ++--
 .../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild    |   16 +++-------------
 dev-util/ati-stream-sdk/files/Makefile             |    2 +-
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 8f587e1..fa28365 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,5 +1,5 @@
-AUX Makefile 2303 RMD160 60c8f2756550189262ee24714124a40f6369be8e SHA1 c4ae39fc81dfde80b62b876efe6b3540ff7422d9 SHA256 cdf4365663d68c898646c5544e280372214fcabf91115254342af432c3aac857
+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 2170 RMD160 d772d1fd4d56f67711c52eb33751d57c20c27ea2 SHA1 2b4145f73cecf210eea5fff18c6a4e3d77f5a190 SHA256 85945cc0e819ca317e6f1994ee134677ef6f0517c0d3092bff3b1a5ac8820688
+EBUILD ati-stream-sdk-2.3-r1.ebuild 1785 RMD160 a49779dcf7c9cc2c759edd252a8de82fb2b4731a SHA1 78f96f8730fb3da67dc6939a646567bf82174217 SHA256 b1f1607754f6ca3cb4784242dd260a9e8a6738d08fc7923dbf02ecdd9ee576aa
 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 c7b3a8c..4a993c0 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
@@ -41,14 +41,8 @@ src_unpack() {
 
 src_prepare(){
 	if use examples; then
-		sed -i -e 's/samples/examples/g'  make/openclsdkrules.mk make/openclsdkdefs.mk \
+		sed -i -e 's/samples/examples/g'  make/openclsdkrules.mk make/openclsdkdefs.mk\
 			|| die "Sed failed"
-		sed -i \
-			-e "/OPENCL_LIBDIRS/{s|lib/\$(CPU_ARCH)|$(get_libdir)|}" \
-			-e "/CAL_LIBDIRS/{s|lib|$(get_libdir)|}" \
-			make/openclsdkdefs.mk || die "Sed failed"
-
-
 	fi
 }
 
@@ -60,13 +54,9 @@ src_install() {
 	rm include/GL/{glext.h,glut.h} || die
 
 	if use amd64; then
-		emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
-		if use multilib; then
-			emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \
-				install-lib install-etc || die "Install multilib failed"
-		fi
+		emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed";
 	else
-		emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
+		emake DESTDIR="${D}" ARCH="x86" install || die "Install failed";
 	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 95fc754..d5bbb83 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -52,7 +52,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[_0-9]*/||g"`;\
+			f1=`echo $$f | sed -e 's|lib/||g' -e 's|x86*/||g'`;\
 			base=`basename $$f1`;\
 			dir=`echo $$f1 | sed -e "s|$$base||g"`;\
 			test -z "$(LIBDIR)/$$dir" || $(MKDIR) "$(LIBDIR)/$$dir";\



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-24 19:12 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-24 19:12 UTC (permalink / raw
  To: gentoo-commits

commit:     d6f48ccbb2108b98fdccaa28ee410c86d0bb66d2
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 19:06:55 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 19:06:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=d6f48ccb

Updated and working ebuilds for 2.3 and 2.1

---
 dev-util/ati-stream-sdk/Manifest                   |    9 +++++++--
 ...sdk-2.3-r1.ebuild => ati-stream-sdk-2.1.ebuild} |    9 +++++++--
 .../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild    |    4 ++++
 dev-util/ati-stream-sdk/files/Makefile             |   18 ++----------------
 dev-util/ati-stream-sdk/files/atiocl32.icd         |    1 +
 dev-util/ati-stream-sdk/files/atiocl64.icd         |    1 +
 6 files changed, 22 insertions(+), 20 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.3-r1.ebuild b/dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild
similarity index 92%
copy from dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
copy to dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild
index c6e51d7..82584b8 100644
--- a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
+++ b/dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="2"
-inherit eutils multilib
+inherit eutils
 
 MY_P="${PN}-v${PV}"
 
@@ -25,6 +25,8 @@ RDEPEND="media-libs/freeglut
 	!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}"
 
@@ -52,23 +54,26 @@ 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
+LDPATH=${DEST}/lib/${LIBDIR}
 EOF
 	doenvd "${T}/99${PN}" || die
 

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



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-24 19:24 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-24 19:24 UTC (permalink / raw
  To: gentoo-commits

commit:     87a093d82d4344406e7bf13db6abead8547dbf91
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 19:19:43 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 19:19:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=87a093d8

Fixed missing install for 2.1

---
 dev-util/ati-stream-sdk/Manifest       |    2 +-
 dev-util/ati-stream-sdk/files/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 2019351..bb7d9f3 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,4 +1,4 @@
-AUX Makefile 1815 RMD160 ebc7bb5f556a184e110b2bd021341363b2a3d4bc SHA1 5084e85a0fd7b250360c7ad2e736da737b9f8ee8 SHA256 3dab5c19a13e0cedf78e670c8e6e3da6f964047037c2cf0bdce79e3c289d0ae8
+AUX Makefile 1833 RMD160 9d368e6e19f792c4018acee657601251a0cec177 SHA1 b0cfac329cd53a7ff3b9b453307d64fb295d4806 SHA256 e8a311db917942a8f71a6b78eecfcaedad0dc35ceab1da0acc1ba1f9c636c56f
 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

diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index 49adfe3..5c886ef 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -13,7 +13,7 @@ MKDIR=mkdir -p
 ARCH:=x86
 BINFILES=bin/x86$(DSUFX)/clc 
 LIBFILES=lib/x86$(DSUFX)/libOpenCL.so lib/x86$(DSUFX)/libatiocl$(SUFX).so lib/x86$(DSUFX)/libGLEW.so lib/gpu/builtins-7xx.bc lib/gpu/builtins-evergreen.bc lib/gpu/builtins-gpucommon.bc lib/x86$(DSUFX)/builtins-x86$(DSUFX).bc
-INCFILES=include/cal*.h include/CL/* include/GL/* include/OVDecode/*
+INCFILES=include/cal*.h include/CL/* include/GL/* include/OVDecode/* include/SDKUtil/*
 ETCFILES=etc/OpenCL/vendors/atiocl$(SUFX).icd
 
 ifeq ($(ARCH),amd64)



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-24 19:46 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-24 19:46 UTC (permalink / raw
  To: gentoo-commits

commit:     41c350d768e00f67a1d3ac0cf9f0f1708e41c2b8
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 19:41:48 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 19:41:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=41c350d7

Install missing .bc for 2.1

---
 dev-util/ati-stream-sdk/Manifest       |    2 +-
 dev-util/ati-stream-sdk/files/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index c54e6cf..03a6124 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,4 +1,4 @@
-AUX Makefile 1833 RMD160 9d368e6e19f792c4018acee657601251a0cec177 SHA1 b0cfac329cd53a7ff3b9b453307d64fb295d4806 SHA256 e8a311db917942a8f71a6b78eecfcaedad0dc35ceab1da0acc1ba1f9c636c56f
+AUX Makefile 1871 RMD160 c34d51521ea9b17f22be693fe0d622f08bc55518 SHA1 2bedd2697a8fa8efde7b9c8a6cfc10b4b64e1996 SHA256 643ff3ddf0ac13d822ab23e7da36a3a68c8068e0e728fd72b7119f60403bf0ff
 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

diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index 5c886ef..abdfbfd 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -12,7 +12,7 @@ MKDIR=mkdir -p
 
 ARCH:=x86
 BINFILES=bin/x86$(DSUFX)/clc 
-LIBFILES=lib/x86$(DSUFX)/libOpenCL.so lib/x86$(DSUFX)/libatiocl$(SUFX).so lib/x86$(DSUFX)/libGLEW.so lib/gpu/builtins-7xx.bc lib/gpu/builtins-evergreen.bc lib/gpu/builtins-gpucommon.bc lib/x86$(DSUFX)/builtins-x86$(DSUFX).bc
+LIBFILES=lib/x86$(DSUFX)/libOpenCL.so lib/x86$(DSUFX)/libatiocl$(SUFX).so lib/x86$(DSUFX)/libGLEW.so lib/gpu/builtins-7xx.bc lib/gpu/builtins-evergreen.bc lib/gpu/builtins-gpucommon.bc lib/x86$(DSUFX)/builtins-x86$(DSUFX).bc lib/x86$(DSUFX)/builtins_amdil_opt.bc
 INCFILES=include/cal*.h include/CL/* include/GL/* include/OVDecode/* include/SDKUtil/*
 ETCFILES=etc/OpenCL/vendors/atiocl$(SUFX).icd
 



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/
@ 2011-02-24 19:50 Dane Smith
  0 siblings, 0 replies; 20+ messages in thread
From: Dane Smith @ 2011-02-24 19:50 UTC (permalink / raw
  To: gentoo-commits

commit:     73f670568614933f31dbd5c9e03238c0b53050b4
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 24 19:45:50 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 19:45:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=73f67056

Install missing binary

---
 dev-util/ati-stream-sdk/Manifest       |    2 +-
 dev-util/ati-stream-sdk/files/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 03a6124..4f85f9b 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,4 +1,4 @@
-AUX Makefile 1871 RMD160 c34d51521ea9b17f22be693fe0d622f08bc55518 SHA1 2bedd2697a8fa8efde7b9c8a6cfc10b4b64e1996 SHA256 643ff3ddf0ac13d822ab23e7da36a3a68c8068e0e728fd72b7119f60403bf0ff
+AUX Makefile 1891 RMD160 eb6b9a225313e10b823c704f5c97828b3317dd6e SHA1 a622b33ca851503927e707504b71959c190fbe8a SHA256 b3553576e286248d3fcd1f27c4f9cfdc9bd7927e0dee422b3c23b20807468cf5
 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

diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index abdfbfd..3946841 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -11,7 +11,7 @@ INSTALLDIR=install -d
 MKDIR=mkdir -p
 
 ARCH:=x86
-BINFILES=bin/x86$(DSUFX)/clc 
+BINFILES=bin/x86$(DSUFX)/clc bin/x86$(DSUFX)/llc 
 LIBFILES=lib/x86$(DSUFX)/libOpenCL.so lib/x86$(DSUFX)/libatiocl$(SUFX).so lib/x86$(DSUFX)/libGLEW.so lib/gpu/builtins-7xx.bc lib/gpu/builtins-evergreen.bc lib/gpu/builtins-gpucommon.bc lib/x86$(DSUFX)/builtins-x86$(DSUFX).bc lib/x86$(DSUFX)/builtins_amdil_opt.bc
 INCFILES=include/cal*.h include/CL/* include/GL/* include/OVDecode/* include/SDKUtil/*
 ETCFILES=etc/OpenCL/vendors/atiocl$(SUFX).icd



^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2011-02-24 19:50 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-23 18:05 [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/files/, dev-util/ati-stream-sdk/ Dane Smith
  -- strict thread matches above, loose matches on Subject: below --
2011-02-24 19:50 Dane Smith
2011-02-24 19:46 Dane Smith
2011-02-24 19:24 Dane Smith
2011-02-24 19:12 Dane Smith
2011-02-24 16:43 Dane Smith
2011-02-24 15:58 Dane Smith
2011-02-24 15:48 Dane Smith
2011-02-24 15:27 Dane Smith
2011-02-24 15:15 Dane Smith
2011-02-24 15:09 Dane Smith
2011-02-24 15:03 Dane Smith
2011-02-23 18:46 Dane Smith
2011-02-23 18:21 Dane Smith
2011-02-23 17:52 Dane Smith
2011-02-23 16:34 Dane Smith
2011-02-23 16:02 Dane Smith
2011-02-23 15:58 Dane Smith
2011-02-23 14:54 Dane Smith
2011-02-23 14:48 Dane Smith

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox