1 |
commit: d6f48ccbb2108b98fdccaa28ee410c86d0bb66d2 |
2 |
Author: Dane Smith <c1pher <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 24 19:06:55 2011 +0000 |
4 |
Commit: Dane Smith <c1pher <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 24 19:06:55 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=d6f48ccb |
7 |
|
8 |
Updated and working ebuilds for 2.3 and 2.1 |
9 |
|
10 |
--- |
11 |
dev-util/ati-stream-sdk/Manifest | 9 +++++++-- |
12 |
...sdk-2.3-r1.ebuild => ati-stream-sdk-2.1.ebuild} | 9 +++++++-- |
13 |
.../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild | 4 ++++ |
14 |
dev-util/ati-stream-sdk/files/Makefile | 18 ++---------------- |
15 |
dev-util/ati-stream-sdk/files/atiocl32.icd | 1 + |
16 |
dev-util/ati-stream-sdk/files/atiocl64.icd | 1 + |
17 |
6 files changed, 22 insertions(+), 20 deletions(-) |
18 |
|
19 |
diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest |
20 |
index 43928c3..554faef 100644 |
21 |
--- a/dev-util/ati-stream-sdk/Manifest |
22 |
+++ b/dev-util/ati-stream-sdk/Manifest |
23 |
@@ -1,5 +1,10 @@ |
24 |
-AUX Makefile 2297 RMD160 cb547b9644ae1f1e013f5627fca57d1b47173cde SHA1 8c7308662ab9ba793c285d5fe6a14b8262875c59 SHA256 17fddeaea2c5d94ed0ee01bf4317a9f20f141ea68a92f78ae4c8b7a36fc6c9bd |
25 |
+AUX Makefile 1815 RMD160 ebc7bb5f556a184e110b2bd021341363b2a3d4bc SHA1 5084e85a0fd7b250360c7ad2e736da737b9f8ee8 SHA256 3dab5c19a13e0cedf78e670c8e6e3da6f964047037c2cf0bdce79e3c289d0ae8 |
26 |
+AUX atiocl32.icd 15 RMD160 69747a1050f4e6893fcba6d36b7a4d9f9e163ec6 SHA1 1f3cbd9b1daa8fc477c3f15b7dcd99832f1eec98 SHA256 eb5907a4f6081d6691d438c8fde40745749f484d02edfa12c129c734caeaf0ca |
27 |
+AUX atiocl64.icd 15 RMD160 1da8cf0f8e40b21573a4e2965672ed36e6fac856 SHA1 193caa5eb42e4818adae1ce1cab841b8a2a71163 SHA256 b1f5b059527f1adee87adc7fbd18c4102126b7f2d1daa05104e745c301355f68 |
28 |
+DIST ati-stream-sdk-v2.1-lnx32.tgz 51590733 RMD160 fa3bf3cc628e1db2e38133ae9d6b833d15b54a39 SHA1 e0ecf04122685f9bf882ee7af9bab276e125904b SHA256 caab5cfed5219ccd0ae62b8fb489a8aa0499581d5cfd173ab4c4ad910bcb5271 |
29 |
+DIST ati-stream-sdk-v2.1-lnx64.tgz 82901409 RMD160 778f0d46e96f77b345a963b1720fce43c0eb96ef SHA1 dbf468d73b19462cf359a0b7248c20cc3bf4ae93 SHA256 46f6e47172a412d5ee3b3aea60fc869ebd26fbccf7fadc9ec5e4146c38f4a7ff |
30 |
DIST ati-stream-sdk-v2.3-lnx32.tgz 49912168 RMD160 07c045de3118531472672e9ef7b3763cb32f7d68 SHA1 972bdbe6942e52411a2f041720348e857f17c388 SHA256 07fd15a51a678c4378767f61466daf9da21d0bab6088a97a70136dd8c976aca6 |
31 |
DIST ati-stream-sdk-v2.3-lnx64.tgz 78659015 RMD160 57af36f62e590ae54cb9d43b880735979b77466c SHA1 43c94e5126563fe3fa4cb92fb6dd20f12864a86d SHA256 f92537d1fc306af0bff1441af4669bf2fa668654b12d9fb53a3a872dc8826cad |
32 |
-EBUILD ati-stream-sdk-2.3-r1.ebuild 2283 RMD160 895b4b104aff70c3bdfcb9cee4bbb460d65c9538 SHA1 3861f98499025bd4d74bbddd0f862e634911f47b SHA256 30f925eba989538ac81801bf734670b03da0100f7cd271767259161c0c4a989a |
33 |
+EBUILD ati-stream-sdk-2.1.ebuild 2423 RMD160 511fb3bdcb334b7569e9f66eb61fd1d482f85b23 SHA1 36f4f8fe721946cc698594dd8d779186f6e9a9ac SHA256 1d1af95ab9b6e9e23d998e43a69f289b09d94574ecd114fc1e5af530031acfaa |
34 |
+EBUILD ati-stream-sdk-2.3-r1.ebuild 2427 RMD160 b94bddd0a82bfcc186d007ea35085cda754b40fd SHA1 9847f7638b72d6339d126bad19470203a009c9a0 SHA256 323406408eb32b40e9700210dde19c528c44a396cfc697448aa8a955692ae097 |
35 |
MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SHA1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a736b9a5b3f1d8ea110446c18e988a3b884d0dca33b7 |
36 |
|
37 |
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 |
38 |
similarity index 92% |
39 |
copy from dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild |
40 |
copy to dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild |
41 |
index c6e51d7..82584b8 100644 |
42 |
--- a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild |
43 |
+++ b/dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild |
44 |
@@ -3,7 +3,7 @@ |
45 |
# $Header: $ |
46 |
|
47 |
EAPI="2" |
48 |
-inherit eutils multilib |
49 |
+inherit eutils |
50 |
|
51 |
MY_P="${PN}-v${PV}" |
52 |
|
53 |
@@ -25,6 +25,8 @@ RDEPEND="media-libs/freeglut |
54 |
!dev-util/nvidia-cuda-toolkit" |
55 |
|
56 |
QA_EXECSTACK="opt/${PN}/lib*/libatiocl??.so" |
57 |
+QA_DT_HASH="/opt/ati-stream-sdk/lib/x86/libGLEW.so |
58 |
+ /opt/ati-stream-sdk/lib/x86_64/libGLEW.so" |
59 |
|
60 |
S="${WORKDIR}/${MY_P}" |
61 |
|
62 |
@@ -52,23 +54,26 @@ src_compile(){ true; } |
63 |
|
64 |
src_install(){ |
65 |
local DEST=/opt/${PN} |
66 |
+ local LIBDIR= |
67 |
|
68 |
rm include/GL/{glext.h,glut.h} || die |
69 |
|
70 |
if use amd64; then |
71 |
+ LIBDIR=x86_64 |
72 |
emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed"; |
73 |
if use multilib; then |
74 |
emake DESTDIR="${D}" ARCH="x86" install-lib \ |
75 |
|| die "Multilib install failed" |
76 |
fi |
77 |
else |
78 |
+ LIBDIR=x86 |
79 |
emake DESTDIR="${D}" ARCH="x86" install || die "Install failed"; |
80 |
fi |
81 |
|
82 |
cat > "${T}/99${PN}" << EOF |
83 |
PATH=${DEST}/bin |
84 |
ROOTPATH=${DEST}/bin |
85 |
-LDPATH=${DEST}/lib |
86 |
+LDPATH=${DEST}/lib/${LIBDIR} |
87 |
EOF |
88 |
doenvd "${T}/99${PN}" || die |
89 |
|
90 |
|
91 |
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 |
92 |
index c6e51d7..7545601 100644 |
93 |
--- a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild |
94 |
+++ b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild |
95 |
@@ -61,8 +61,12 @@ src_install(){ |
96 |
emake DESTDIR="${D}" ARCH="x86" install-lib \ |
97 |
|| die "Multilib install failed" |
98 |
fi |
99 |
+ insinto /etc/OpenCL/vendors |
100 |
+ doins "${FILESDIR}"/atiocl64.icd || die |
101 |
else |
102 |
emake DESTDIR="${D}" ARCH="x86" install || die "Install failed"; |
103 |
+ insinto /etc/OpenCL/vendors |
104 |
+ doins "${FILESDIR}"/atiocl32.icd || die |
105 |
fi |
106 |
|
107 |
cat > "${T}/99${PN}" << EOF |
108 |
|
109 |
diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile |
110 |
index d5bbb83..49adfe3 100644 |
111 |
--- a/dev-util/ati-stream-sdk/files/Makefile |
112 |
+++ b/dev-util/ati-stream-sdk/files/Makefile |
113 |
@@ -24,20 +24,6 @@ DSUFX= |
114 |
SUFX=32 |
115 |
endif |
116 |
|
117 |
-install-etc: |
118 |
- test -z "$(ETCDIR)" || $(MKDIR) "$(ETCDIR)" |
119 |
- tar -xzf icd-registration.tgz || exit 1 |
120 |
- @list='$(ETCFILES)'; for f in $$list; do\ |
121 |
- if test -f $$f; then\ |
122 |
- f1=`echo $$f | sed -e 's|etc/||g'`;\ |
123 |
- base=`basename $$f1`;\ |
124 |
- dir=`echo $$f1 | sed -e "s|$$base||g"`;\ |
125 |
- test -z "$(ETCDIR)/$$dir" || $(MKDIR) "$(ETCDIR)/$$dir";\ |
126 |
- echo "$(INSTALLDAT) $$f $(ETCDIR)/$$f1";\ |
127 |
- $(INSTALLDAT) "$$f" $(ETCDIR)/$$f1 || exit 1;\ |
128 |
- else :; fi;\ |
129 |
- done |
130 |
- |
131 |
install-bin: |
132 |
test -z "$(BINDIR)" || $(MKDIR) "$(BINDIR)" |
133 |
@list='$(BINFILES)'; for f in $$list; do\ |
134 |
@@ -52,7 +38,7 @@ install-lib: |
135 |
test -z "$(LIBDIR)" || $(MKDIR) "$(LIBDIR)" |
136 |
@list='$(LIBFILES)'; for f in $$list; do\ |
137 |
if test -f $$f; then\ |
138 |
- f1=`echo $$f | sed -e 's|lib/||g' -e 's|x86*/||g'`;\ |
139 |
+ f1=`echo $$f | sed -e 's|lib/||g'`;\ |
140 |
base=`basename $$f1`;\ |
141 |
dir=`echo $$f1 | sed -e "s|$$base||g"`;\ |
142 |
test -z "$(LIBDIR)/$$dir" || $(MKDIR) "$(LIBDIR)/$$dir";\ |
143 |
@@ -74,4 +60,4 @@ install-include: |
144 |
else :; fi;\ |
145 |
done |
146 |
|
147 |
-install: install-etc install-bin install-lib install-include |
148 |
+install: install-bin install-lib install-include |
149 |
|
150 |
diff --git a/dev-util/ati-stream-sdk/files/atiocl32.icd b/dev-util/ati-stream-sdk/files/atiocl32.icd |
151 |
new file mode 100644 |
152 |
index 0000000..b7512cf |
153 |
--- /dev/null |
154 |
+++ b/dev-util/ati-stream-sdk/files/atiocl32.icd |
155 |
@@ -0,0 +1 @@ |
156 |
+libatiocl32.so |
157 |
|
158 |
diff --git a/dev-util/ati-stream-sdk/files/atiocl64.icd b/dev-util/ati-stream-sdk/files/atiocl64.icd |
159 |
new file mode 100644 |
160 |
index 0000000..e16eab5 |
161 |
--- /dev/null |
162 |
+++ b/dev-util/ati-stream-sdk/files/atiocl64.icd |
163 |
@@ -0,0 +1 @@ |
164 |
+libatiocl64.so |