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/files/, dev-util/ati-stream-sdk/
Date: Wed, 23 Feb 2011 16:34:57
Message-Id: 1d8aa7d242f659ba1b7a84c858008265cceddd65.c1pher@gentoo
1 commit: 1d8aa7d242f659ba1b7a84c858008265cceddd65
2 Author: Dane Smith <c1pher <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 23 16:30:07 2011 +0000
4 Commit: Dane Smith <c1pher <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 23 16:30:07 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=1d8aa7d2
7
8 Typo in makefile. Fix ebuild.
9
10 ---
11 dev-util/ati-stream-sdk/Manifest | 4 ++--
12 .../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild | 5 +++--
13 dev-util/ati-stream-sdk/files/Makefile | 2 +-
14 3 files changed, 6 insertions(+), 5 deletions(-)
15
16 diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
17 index 52ed488..b80f176 100644
18 --- a/dev-util/ati-stream-sdk/Manifest
19 +++ b/dev-util/ati-stream-sdk/Manifest
20 @@ -1,6 +1,6 @@
21 -AUX Makefile 1702 RMD160 900cbc58cb5ae1d7df48919e981ed310c3418d5e SHA1 8752ad75e75b38b41f920b7ca03eda066ff9be82 SHA256 b3b38e9ba2d3ff961d8bb0990ecf014b16c05d23af1c52d5b7acb3cb3721e6e8
22 +AUX Makefile 1702 RMD160 7e00d6e87f13632a35c7c0b497ca5dc8d9727071 SHA1 06953c67d2d3d824bb77b7d5e9cc9ba72764b093 SHA256 24bb9a328d01746fc0f67774b6ebb792754618a78c0090fc7b414d91c290d107
23 DIST ati-stream-sdk-v2.3-lnx32.tgz 49912168 RMD160 07c045de3118531472672e9ef7b3763cb32f7d68 SHA1 972bdbe6942e52411a2f041720348e857f17c388 SHA256 07fd15a51a678c4378767f61466daf9da21d0bab6088a97a70136dd8c976aca6
24 DIST ati-stream-sdk-v2.3-lnx64.tgz 78659015 RMD160 57af36f62e590ae54cb9d43b880735979b77466c SHA1 43c94e5126563fe3fa4cb92fb6dd20f12864a86d SHA256 f92537d1fc306af0bff1441af4669bf2fa668654b12d9fb53a3a872dc8826cad
25 -EBUILD ati-stream-sdk-2.3-r1.ebuild 1692 RMD160 a2acb27a3b095ff67427243f9eef5b11cccff482 SHA1 e471885ebd5ddb249c8f20ee167ee610203178df SHA256 7d2637c6013f7b1a4629d897de299bccac48bda5577362c6fb9f43a1fb026dce
26 +EBUILD ati-stream-sdk-2.3-r1.ebuild 1786 RMD160 de6c2db9cf685c43b31b3748a77b1cc1740b8eb2 SHA1 35c2e28b3b69934bfde2efba4ba10c42f7127809 SHA256 4b27bcdc75f23eef56b3141d0d08b5ad80d780c56ed545dbfa5b9c4a60e28c8b
27 EBUILD ati-stream-sdk-2.3.ebuild 1902 RMD160 3223fecbf191d822e896965ba63be3ebb2475d1e SHA1 b30d65c95630319b86c0b7a4fe5cd22323379093 SHA256 1f55cff88074875c4867fd52441fd266fbc3ab96016865f93eb21a4a07598948
28 MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SHA1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a736b9a5b3f1d8ea110446c18e988a3b884d0dca33b7
29
30 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
31 index c9b22e9..e0528e6 100644
32 --- a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
33 +++ b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
34 @@ -54,15 +54,16 @@ src_install() {
35 rm include/GL/{glext.h,glut.h} || die
36
37 if use amd64; then
38 - emake DESTDIR="${D}" ARCH="amd64" install;
39 + emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed";
40 else
41 - emake DESTDIR="${D}" install-x86;
42 + emake DESTDIR="${D}" ARCH="x86" install || die "Install failed";
43 fi
44
45 cat > "${T}/99${PN}" << EOF
46 PATH=${DEST}/bin
47 ROOTPATH=${DEST}/bin
48 LDPATH=${DEST}/$(get_libdir)
49 +LD_LIBRARY_PATH="${DEST}/$(get_libdir)
50 EOF
51 doenvd "${T}/99${PN}"
52
53
54 diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
55 index 544deae..dc0172f 100644
56 --- a/dev-util/ati-stream-sdk/files/Makefile
57 +++ b/dev-util/ati-stream-sdk/files/Makefile
58 @@ -11,7 +11,7 @@ MKDIR=mkdir -p
59
60 ARCH:=x86
61 BINFILES=bin/x86$(DSUFX)/clc
62 -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
63 +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
64 INCFILES=include/cal*.h include/CL/* include/GL/* include/OVDecode/*
65
66 ifeq ($(ARCH),amd64)