Gentoo Archives: gentoo-commits

From: Dane Smith <c1pher@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/
Date: Thu, 24 Feb 2011 15:00:30
Message-Id: 8cf1008d60cdae3c999eeb480d186458623a7db7.c1pher@gentoo
1 commit: 8cf1008d60cdae3c999eeb480d186458623a7db7
2 Author: Dane Smith <c1pher <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 24 14:55:41 2011 +0000
4 Commit: Dane Smith <c1pher <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 24 14:55:41 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=8cf1008d
7
8 Revert to older commit.
9
10 ---
11 dev-util/ati-stream-sdk/Manifest | 2 +-
12 .../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild | 21 +++++--------------
13 2 files changed, 7 insertions(+), 16 deletions(-)
14
15 diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
16 index d9ad4cc..542b5d3 100644
17 --- a/dev-util/ati-stream-sdk/Manifest
18 +++ b/dev-util/ati-stream-sdk/Manifest
19 @@ -1,5 +1,5 @@
20 AUX Makefile 2303 RMD160 60c8f2756550189262ee24714124a40f6369be8e SHA1 c4ae39fc81dfde80b62b876efe6b3540ff7422d9 SHA256 cdf4365663d68c898646c5544e280372214fcabf91115254342af432c3aac857
21 DIST ati-stream-sdk-v2.3-lnx32.tgz 49912168 RMD160 07c045de3118531472672e9ef7b3763cb32f7d68 SHA1 972bdbe6942e52411a2f041720348e857f17c388 SHA256 07fd15a51a678c4378767f61466daf9da21d0bab6088a97a70136dd8c976aca6
22 DIST ati-stream-sdk-v2.3-lnx64.tgz 78659015 RMD160 57af36f62e590ae54cb9d43b880735979b77466c SHA1 43c94e5126563fe3fa4cb92fb6dd20f12864a86d SHA256 f92537d1fc306af0bff1441af4669bf2fa668654b12d9fb53a3a872dc8826cad
23 -EBUILD ati-stream-sdk-2.3-r1.ebuild 2264 RMD160 c800d9b220a61e3aa764e3227a71ec4549947a66 SHA1 6db819c535ae2e6f706fa57b8853908d8819faef SHA256 3c503ed93b71e50d681251777669849acfbfd200d0e7d9670006edcd41aabd70
24 +EBUILD ati-stream-sdk-2.3-r1.ebuild 1785 RMD160 a49779dcf7c9cc2c759edd252a8de82fb2b4731a SHA1 78f96f8730fb3da67dc6939a646567bf82174217 SHA256 b1f1607754f6ca3cb4784242dd260a9e8a6738d08fc7923dbf02ecdd9ee576aa
25 MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SHA1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a736b9a5b3f1d8ea110446c18e988a3b884d0dca33b7
26
27 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
28 index c322054..4a993c0 100644
29 --- a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
30 +++ b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
31 @@ -41,13 +41,8 @@ src_unpack() {
32
33 src_prepare(){
34 if use examples; then
35 - sed -i -e 's/samples/examples/g' make/openclsdkrules.mk make/openclsdkdefs.mk \
36 + sed -i -e 's/samples/examples/g' make/openclsdkrules.mk make/openclsdkdefs.mk\
37 || die "Sed failed"
38 -# sed -i \
39 -# -e "/OPENCL_LIBDIRS/{s|lib/\$(CPU_ARCH)|$(get_libdir)|}" \
40 -# -e "s|\$(DEPTH)/lib/\$(CPU_ARCH)|\$(DEPTH)/$(get_libdir)|" \
41 -# -e "/CAL_LIBDIRS/{s|lib|$(get_libdir)|}" \
42 -# make/openclsdkdefs.mk || die "Sed failed"
43 fi
44 }
45
46 @@ -59,20 +54,16 @@ src_install() {
47 rm include/GL/{glext.h,glut.h} || die
48
49 if use amd64; then
50 -# emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
51 emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed";
52 -# if use multilib; then
53 -# emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \
54 -# install-lib || die "Install multilib failed"
55 -# fi
56 else
57 - emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
58 + emake DESTDIR="${D}" ARCH="x86" install || die "Install failed";
59 fi
60
61 cat > "${T}/99${PN}" << EOF
62 -PATH=${DEST}/bin/
63 -ROOTPATH=${DEST}/bin/
64 -LDPATH=${DEST}/$(get_libdir)/
65 +PATH=${DEST}/bin
66 +ROOTPATH=${DEST}/bin
67 +LDPATH=${DEST}/$(get_libdir)
68 +LD_LIBRARY_PATH=${DEST}/$(get_libdir)
69 EOF
70 doenvd "${T}/99${PN}"