1 |
commit: beb896a499b167679a5398ca956abe5f7f85aee8 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 30 22:10:24 2019 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 30 22:10:24 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beb896a4 |
7 |
|
8 |
app-emulation/gallium-nine-standalone: Drop old 0.3 and 0.4 |
9 |
|
10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
12 |
|
13 |
app-emulation/gallium-nine-standalone/Manifest | 2 - |
14 |
.../gallium-nine-standalone/files/flags.patch | 28 ------ |
15 |
.../gallium-nine-standalone-0.3.ebuild | 112 --------------------- |
16 |
.../gallium-nine-standalone-0.4.ebuild | 109 -------------------- |
17 |
4 files changed, 251 deletions(-) |
18 |
|
19 |
diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest |
20 |
index 72d80c4764e..83e47d1230a 100644 |
21 |
--- a/app-emulation/gallium-nine-standalone/Manifest |
22 |
+++ b/app-emulation/gallium-nine-standalone/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST gallium-nine-standalone-0.3.tar.gz 63887 BLAKE2B bd198617a5d3d3830bd5127b63eed2c82bff037141ae72ff9237ad5062fdbe9b6797e233eaf86e06d92153487c53389eb094b0be3b0cbdbf3fe565292a15cbb0 SHA512 80fedca58523fbf318109d2d3d5420e97d26ebf5b89b9f1965165c7a33c9dab9c62a65f14b75569b5126c549f5df91beef372d54e94dc90c608932eeb6a59829 |
25 |
-DIST gallium-nine-standalone-0.4.tar.gz 66820 BLAKE2B 7e7b0028f0c7e7c26fa1ee164e7e867fee39a5f315b750bfc3537e8720e9fbc625ca27fb28a58e8e521af455f8ab347d6fd6ca82786fe5ac9d76e368cd43466e SHA512 6af31e828400c6f711c76d91fb65215f4ba79c31b8d98f3e953b319593d96d1e5e78e07aca96529de37bbb89f3479a4d4db5f58e32ce7b98667284be10a9e532 |
26 |
DIST gallium-nine-standalone-0.5.tar.gz 69056 BLAKE2B 6acfd500a31e480e2e09e751097beaa2bc94c574edd2b313adb707dc65447be1868ed190bf13549cc38eae945d421242a5d3b2c068486ad35347903e27e0bf80 SHA512 6223a851536c67d32e3a834d7a3c7b93fb59c226b127e1ee1b5a72a7cc93172173f5004ca4944a842015650ef80e8427a684109ae5a4a9e9ef838961e0767c78 |
27 |
|
28 |
diff --git a/app-emulation/gallium-nine-standalone/files/flags.patch b/app-emulation/gallium-nine-standalone/files/flags.patch |
29 |
deleted file mode 100644 |
30 |
index 217dcddf35b..00000000000 |
31 |
--- a/app-emulation/gallium-nine-standalone/files/flags.patch |
32 |
+++ /dev/null |
33 |
@@ -1,28 +0,0 @@ |
34 |
-diff -Naur a/tools/cross-wine32.in b/tools/cross-wine32.in |
35 |
---- a/tools/cross-wine32.in 2019-01-12 16:45:09.190471883 +0000 |
36 |
-+++ b/tools/cross-wine32.in 2019-01-12 16:48:22.569404982 +0000 |
37 |
-@@ -5,8 +5,8 @@ |
38 |
- pkgconfig = '@PKG_CONFIG@' |
39 |
- |
40 |
- [properties] |
41 |
--c_args = ['-m32', '--no-gnu-unique'] |
42 |
--c_link_args = ['-m32', '-mwindows'] |
43 |
-+c_args = @CFLAGS@ + ['-m32', '--no-gnu-unique'] |
44 |
-+c_link_args = @LDFLAGS@ + ['-m32', '-mwindows'] |
45 |
- needs_exe_wrapper = true |
46 |
- |
47 |
- [host_machine] |
48 |
-diff -Naur a/tools/cross-wine64.in b/tools/cross-wine64.in |
49 |
---- a/tools/cross-wine64.in 2019-01-12 16:45:09.190471883 +0000 |
50 |
-+++ b/tools/cross-wine64.in 2019-01-12 16:48:19.865349306 +0000 |
51 |
-@@ -5,8 +5,8 @@ |
52 |
- pkgconfig = '@PKG_CONFIG@' |
53 |
- |
54 |
- [properties] |
55 |
--c_args = ['-m64', '--no-gnu-unique'] |
56 |
--c_link_args = ['-m64', '-mwindows'] |
57 |
-+c_args = @CFLAGS@ + ['-m64', '--no-gnu-unique'] |
58 |
-+c_link_args = @LDFLAGS@ + ['-m64', '-mwindows'] |
59 |
- needs_exe_wrapper = true |
60 |
- |
61 |
- [host_machine] |
62 |
|
63 |
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild |
64 |
deleted file mode 100644 |
65 |
index b71e4405330..00000000000 |
66 |
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild |
67 |
+++ /dev/null |
68 |
@@ -1,112 +0,0 @@ |
69 |
-# Copyright 1999-2019 Gentoo Authors |
70 |
-# Distributed under the terms of the GNU General Public License v2 |
71 |
- |
72 |
-EAPI=7 |
73 |
- |
74 |
-inherit meson multilib-minimal toolchain-funcs |
75 |
- |
76 |
-MY_PN="wine-nine-standalone" |
77 |
-DESCRIPTION="A standalone version of the WINE parts of Gallium Nine" |
78 |
-HOMEPAGE="https://github.com/iXit/wine-nine-standalone" |
79 |
- |
80 |
-if [[ $PV = 9999* ]]; then |
81 |
- inherit git-r3 |
82 |
- EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git" |
83 |
-else |
84 |
- SRC_URI="https://github.com/iXit/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
85 |
- S="${WORKDIR}/${MY_PN}-${PV}" |
86 |
- KEYWORDS="-* ~amd64 ~x86" |
87 |
-fi |
88 |
- |
89 |
-LICENSE="LGPL-2.1+" |
90 |
-SLOT="0" |
91 |
- |
92 |
-# We don't put Wine in RDEPEND because you can also use this with |
93 |
-# Steam's Proton. |
94 |
- |
95 |
-RDEPEND=" |
96 |
- media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}] |
97 |
- x11-libs/libX11[${MULTILIB_USEDEP}] |
98 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
99 |
- x11-libs/libxcb[${MULTILIB_USEDEP}] |
100 |
-" |
101 |
- |
102 |
-DEPEND=" |
103 |
- ${RDEPEND} |
104 |
- virtual/pkgconfig[${MULTILIB_USEDEP}] |
105 |
- virtual/wine[${MULTILIB_USEDEP}] |
106 |
-" |
107 |
- |
108 |
-PATCHES=( |
109 |
- "${FILESDIR}"/flags.patch |
110 |
- "${FILESDIR}"/0.3-nine-dll-path.patch |
111 |
-) |
112 |
- |
113 |
-bits() { |
114 |
- if [[ ${ABI} = amd64 ]]; then |
115 |
- echo 64 |
116 |
- else |
117 |
- echo 32 |
118 |
- fi |
119 |
-} |
120 |
- |
121 |
-src_prepare() { |
122 |
- default |
123 |
- |
124 |
- # Upstream includes a bootstrap.sh script with hardcoded CHOSTs to |
125 |
- # create the Meson cross files. We improve on that here but also |
126 |
- # inject CFLAGS and LDFLAGS, partly to simply respect these, and |
127 |
- # partly to allow d3d9-nine.dll to be loaded from a location outside |
128 |
- # WINEPREFIX. This avoids the need for the nine-install.sh script, |
129 |
- # which doesn't play well with our multi-Wine environment. |
130 |
- bootstrap_nine() { |
131 |
- local file=tools/cross-wine$(bits) |
132 |
- local g9dll=Z:${EPREFIX//\//\\}\\usr\\$(get_libdir)\\d3d9-nine.dll.so |
133 |
- |
134 |
- # Yes, these ridiculous backslashes are needed! |
135 |
- g9dll=\\\\\\\\\\\"${g9dll//\\/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\}\\\\\\\\\\\" |
136 |
- |
137 |
- sed \ |
138 |
- -e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \ |
139 |
- -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} -DG9DLL=${g9dll}")!" \ |
140 |
- -e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \ |
141 |
- ${file}.in > ${file} || die |
142 |
- } |
143 |
- |
144 |
- multilib_foreach_abi bootstrap_nine |
145 |
-} |
146 |
- |
147 |
-multilib_src_configure() { |
148 |
- # We override bindir because otherwise the 32-bit exe is overwritten |
149 |
- # by the 64-bit exe and we need both of them. |
150 |
- local emesonargs=( |
151 |
- --cross-file "${S}/tools/cross-wine$(bits)" |
152 |
- --bindir "$(get_libdir)" |
153 |
- -Ddistro-independent=false |
154 |
- -Ddri2=false |
155 |
- ) |
156 |
- meson_src_configure |
157 |
-} |
158 |
- |
159 |
-multilib_src_compile() { |
160 |
- meson_src_compile |
161 |
-} |
162 |
- |
163 |
-multilib_src_install() { |
164 |
- meson_src_install |
165 |
-} |
166 |
- |
167 |
-pkg_postinst() { |
168 |
- local bits=$(bits) |
169 |
- |
170 |
- einfo "Don't remove the Z: drive from your WINEPREFIX as this relies on it." |
171 |
- einfo |
172 |
- einfo "To set up the ${bits}-bit library, launch your preferred Wine as follows:" |
173 |
- einfo " wine${bits/32} ${EPREFIX}/usr/$(get_libdir)/ninewinecfg.exe.so" |
174 |
- |
175 |
- if use abi_x86_64 && use abi_x86_32; then |
176 |
- einfo |
177 |
- einfo "To set up the 32-bit library, launch your preferred Wine as follows:" |
178 |
- einfo " wine ${EPREFIX}/usr/$(ABI=x86 get_libdir)/ninewinecfg.exe.so" |
179 |
- fi |
180 |
-} |
181 |
|
182 |
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild |
183 |
deleted file mode 100644 |
184 |
index 3c025087d82..00000000000 |
185 |
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild |
186 |
+++ /dev/null |
187 |
@@ -1,109 +0,0 @@ |
188 |
-# Copyright 1999-2019 Gentoo Authors |
189 |
-# Distributed under the terms of the GNU General Public License v2 |
190 |
- |
191 |
-EAPI=7 |
192 |
- |
193 |
-inherit meson multilib-minimal toolchain-funcs |
194 |
- |
195 |
-MY_PN="wine-nine-standalone" |
196 |
-DESCRIPTION="A standalone version of the WINE parts of Gallium Nine" |
197 |
-HOMEPAGE="https://github.com/iXit/wine-nine-standalone" |
198 |
- |
199 |
-if [[ $PV = 9999* ]]; then |
200 |
- inherit git-r3 |
201 |
- EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git" |
202 |
-else |
203 |
- SRC_URI="https://github.com/iXit/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
204 |
- S="${WORKDIR}/${MY_PN}-${PV}" |
205 |
- KEYWORDS="-* ~amd64 ~x86" |
206 |
-fi |
207 |
- |
208 |
-LICENSE="LGPL-2.1+" |
209 |
-SLOT="0" |
210 |
- |
211 |
-# We don't put Wine in RDEPEND because you can also use this with |
212 |
-# Steam's Proton. |
213 |
- |
214 |
-RDEPEND=" |
215 |
- media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}] |
216 |
- x11-libs/libX11[${MULTILIB_USEDEP}] |
217 |
- x11-libs/libxcb[${MULTILIB_USEDEP}] |
218 |
-" |
219 |
- |
220 |
-DEPEND=" |
221 |
- ${RDEPEND} |
222 |
- virtual/pkgconfig[${MULTILIB_USEDEP}] |
223 |
- virtual/wine[${MULTILIB_USEDEP}] |
224 |
- >=dev-util/meson-0.50.1 |
225 |
-" |
226 |
- |
227 |
-PATCHES=( |
228 |
- "${FILESDIR}"/flags.patch |
229 |
- "${FILESDIR}"/0.3-nine-dll-path.patch |
230 |
-) |
231 |
- |
232 |
-bits() { |
233 |
- if [[ ${ABI} = amd64 ]]; then |
234 |
- echo 64 |
235 |
- else |
236 |
- echo 32 |
237 |
- fi |
238 |
-} |
239 |
- |
240 |
-src_prepare() { |
241 |
- default |
242 |
- |
243 |
- # Upstream includes a bootstrap.sh script with hardcoded CHOSTs to |
244 |
- # create the Meson cross files. We improve on that here but also |
245 |
- # inject CFLAGS and LDFLAGS, partly to simply respect these, and |
246 |
- # partly to allow d3d9-nine.dll to be loaded from a location outside |
247 |
- # WINEPREFIX. This avoids the need for the nine-install.sh script, |
248 |
- # which doesn't play well with our multi-Wine environment. |
249 |
- bootstrap_nine() { |
250 |
- local file=tools/cross-wine$(bits) |
251 |
- local g9dll=\"Z:${EPREFIX}/usr/$(get_libdir)/d3d9-nine.dll.so\" |
252 |
- |
253 |
- sed \ |
254 |
- -e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \ |
255 |
- -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \ |
256 |
- -e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \ |
257 |
- ${file}.in > ${file} || die |
258 |
- } |
259 |
- |
260 |
- multilib_foreach_abi bootstrap_nine |
261 |
-} |
262 |
- |
263 |
-multilib_src_configure() { |
264 |
- # We override bindir because otherwise the 32-bit exe is overwritten |
265 |
- # by the 64-bit exe and we need both of them. |
266 |
- local emesonargs=( |
267 |
- --cross-file "${S}/tools/cross-wine$(bits)" |
268 |
- --bindir "$(get_libdir)" |
269 |
- -Ddistro-independent=false |
270 |
- -Ddri2=false |
271 |
- ) |
272 |
- meson_src_configure |
273 |
-} |
274 |
- |
275 |
-multilib_src_compile() { |
276 |
- meson_src_compile |
277 |
-} |
278 |
- |
279 |
-multilib_src_install() { |
280 |
- meson_src_install |
281 |
-} |
282 |
- |
283 |
-pkg_postinst() { |
284 |
- local bits=$(bits) |
285 |
- |
286 |
- einfo "Don't remove the Z: drive from your WINEPREFIX as this relies on it." |
287 |
- einfo |
288 |
- einfo "To set up the ${bits}-bit library, launch your preferred Wine as follows:" |
289 |
- einfo " wine${bits/32} ${EPREFIX}/usr/$(get_libdir)/ninewinecfg.exe.so" |
290 |
- |
291 |
- if use abi_x86_64 && use abi_x86_32; then |
292 |
- einfo |
293 |
- einfo "To set up the 32-bit library, launch your preferred Wine as follows:" |
294 |
- einfo " wine ${EPREFIX}/usr/$(ABI=x86 get_libdir)/ninewinecfg.exe.so" |
295 |
- fi |
296 |
-} |