1 |
commit: c4082496c5f114ec6acb76ba1e80d94f0073714a |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 26 23:39:44 2019 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 26 23:39:44 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4082496 |
7 |
|
8 |
app-emulation/gallium-nine-standalone: Drop old 0_p20190113 |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
12 |
|
13 |
app-emulation/gallium-nine-standalone/Manifest | 1 - |
14 |
.../files/nine-dll-path.patch | 12 --- |
15 |
.../gallium-nine-standalone-0_p20190113.ebuild | 110 --------------------- |
16 |
3 files changed, 123 deletions(-) |
17 |
|
18 |
diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest |
19 |
index 963e790f0b2..88ab0abf6c1 100644 |
20 |
--- a/app-emulation/gallium-nine-standalone/Manifest |
21 |
+++ b/app-emulation/gallium-nine-standalone/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
DIST gallium-nine-standalone-0.3.tar.gz 63887 BLAKE2B bd198617a5d3d3830bd5127b63eed2c82bff037141ae72ff9237ad5062fdbe9b6797e233eaf86e06d92153487c53389eb094b0be3b0cbdbf3fe565292a15cbb0 SHA512 80fedca58523fbf318109d2d3d5420e97d26ebf5b89b9f1965165c7a33c9dab9c62a65f14b75569b5126c549f5df91beef372d54e94dc90c608932eeb6a59829 |
24 |
-DIST gallium-nine-standalone-0_p20190113.tar.gz 58954 BLAKE2B 29be3f5501cc4463aa05216b7360e2a5a949c498dd1c3a0170d5a2f7f508c1fe3171f90f8e35bbe95530be5d6b98b70c5a99362e69d4a64615e40fbb9c8eb96a SHA512 2b2ab79b3d9f2c19967a16200cf69e7eba589d4d3d8918890b9504a5cb4895cd76000b6f3852baa738845e8508c6d67843f45d368225878d446ec6e907f75de4 |
25 |
|
26 |
diff --git a/app-emulation/gallium-nine-standalone/files/nine-dll-path.patch b/app-emulation/gallium-nine-standalone/files/nine-dll-path.patch |
27 |
deleted file mode 100644 |
28 |
index 9399dde3e4f..00000000000 |
29 |
--- a/app-emulation/gallium-nine-standalone/files/nine-dll-path.patch |
30 |
+++ /dev/null |
31 |
@@ -1,12 +0,0 @@ |
32 |
-diff -Naur a/ninewinecfg/main.c b/ninewinecfg/main.c |
33 |
---- a/ninewinecfg/main.c 2019-01-12 19:43:40.113737110 +0000 |
34 |
-+++ b/ninewinecfg/main.c 2019-01-12 19:46:54.213703713 +0000 |
35 |
-@@ -47,7 +47,7 @@ |
36 |
- #define WINE_STAGING 1 |
37 |
- #endif |
38 |
- |
39 |
--static const char * const fn_nine_dll = "d3d9-nine.dll"; |
40 |
-+static const char * const fn_nine_dll = G9DLL; |
41 |
- static const char * const reg_path_dll_overrides = "Software\\Wine\\DllOverrides"; |
42 |
- static const char * const reg_path_dll_redirects = "Software\\Wine\\DllRedirects"; |
43 |
- static const char * const reg_key_d3d9 = "d3d9"; |
44 |
|
45 |
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0_p20190113.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0_p20190113.ebuild |
46 |
deleted file mode 100644 |
47 |
index 74e8ff9eb03..00000000000 |
48 |
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0_p20190113.ebuild |
49 |
+++ /dev/null |
50 |
@@ -1,110 +0,0 @@ |
51 |
-# Copyright 1999-2019 Gentoo Authors |
52 |
-# Distributed under the terms of the GNU General Public License v2 |
53 |
- |
54 |
-EAPI=7 |
55 |
- |
56 |
-inherit meson multilib-minimal toolchain-funcs |
57 |
- |
58 |
-DESCRIPTION="A standalone version of the WINE parts of Gallium Nine" |
59 |
-HOMEPAGE="https://github.com/dhewg/nine" |
60 |
- |
61 |
-if [[ $PV = 9999* ]]; then |
62 |
- inherit git-r3 |
63 |
- EGIT_REPO_URI="https://github.com/dhewg/nine.git" |
64 |
-else |
65 |
- COMMIT="e10dd1a770c91d5ff13343c9a0186665b7df6114" |
66 |
- SRC_URI="https://github.com/dhewg/nine/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
67 |
- S="${WORKDIR}/nine-${COMMIT}" |
68 |
- KEYWORDS="-* ~amd64 ~x86" |
69 |
-fi |
70 |
- |
71 |
-LICENSE="LGPL-2.1+" |
72 |
-SLOT="0" |
73 |
- |
74 |
-# We don't put Wine in RDEPEND because you can also use this with |
75 |
-# Steam's Proton. |
76 |
- |
77 |
-RDEPEND=" |
78 |
- media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}] |
79 |
- x11-libs/libX11[${MULTILIB_USEDEP}] |
80 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
81 |
- x11-libs/libxcb[${MULTILIB_USEDEP}] |
82 |
-" |
83 |
- |
84 |
-DEPEND=" |
85 |
- ${RDEPEND} |
86 |
- virtual/pkgconfig[${MULTILIB_USEDEP}] |
87 |
- virtual/wine[${MULTILIB_USEDEP}] |
88 |
-" |
89 |
- |
90 |
-PATCHES=( |
91 |
- "${FILESDIR}"/flags.patch |
92 |
- "${FILESDIR}"/nine-dll-path.patch |
93 |
-) |
94 |
- |
95 |
-bits() { |
96 |
- if [[ ${ABI} = amd64 ]]; then |
97 |
- echo 64 |
98 |
- else |
99 |
- echo 32 |
100 |
- fi |
101 |
-} |
102 |
- |
103 |
-src_prepare() { |
104 |
- default |
105 |
- |
106 |
- # Upstream includes a bootstrap.sh script with hardcoded CHOSTs to |
107 |
- # create the Meson cross files. We improve on that here but also |
108 |
- # inject CFLAGS and LDFLAGS, partly to simply respect these, and |
109 |
- # partly to allow d3d9-nine.dll to be loaded from a location outside |
110 |
- # WINEPREFIX. This avoids the need for the nine-install.sh script, |
111 |
- # which doesn't play well with our multi-Wine environment. |
112 |
- bootstrap_nine() { |
113 |
- local file=tools/cross-wine$(bits) |
114 |
- local g9dll=Z:${EPREFIX//\//\\}\\usr\\$(get_libdir)\\d3d9-nine.dll.so |
115 |
- |
116 |
- # Yes, these ridiculous backslashes are needed! |
117 |
- g9dll=\\\\\\\\\\\"${g9dll//\\/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\}\\\\\\\\\\\" |
118 |
- |
119 |
- sed \ |
120 |
- -e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \ |
121 |
- -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} -DG9DLL=${g9dll}")!" \ |
122 |
- -e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \ |
123 |
- ${file}.in > ${file} || die |
124 |
- } |
125 |
- |
126 |
- multilib_foreach_abi bootstrap_nine |
127 |
-} |
128 |
- |
129 |
-multilib_src_configure() { |
130 |
- # We override bindir because otherwise the 32-bit exe is overwritten |
131 |
- # by the 64-bit exe and we need both of them. |
132 |
- local emesonargs=( |
133 |
- --cross-file "${S}/tools/cross-wine$(bits)" |
134 |
- --bindir "$(get_libdir)" |
135 |
- ) |
136 |
- meson_src_configure |
137 |
-} |
138 |
- |
139 |
-multilib_src_compile() { |
140 |
- meson_src_compile |
141 |
-} |
142 |
- |
143 |
-multilib_src_install() { |
144 |
- meson_src_install |
145 |
-} |
146 |
- |
147 |
-pkg_postinst() { |
148 |
- local bits=$(bits) |
149 |
- |
150 |
- einfo "Don't remove the Z: drive from your WINEPREFIX as this relies on it." |
151 |
- einfo |
152 |
- einfo "To set up the ${bits}-bit library, launch your preferred Wine as follows:" |
153 |
- einfo " wine${bits/32} ${EPREFIX}/usr/$(get_libdir)/ninewinecfg.exe.so" |
154 |
- |
155 |
- if use abi_x86_64 && use abi_x86_32; then |
156 |
- einfo |
157 |
- einfo "To set up the 32-bit library, launch your preferred Wine as follows:" |
158 |
- einfo " wine ${EPREFIX}/usr/$(ABI=x86 get_libdir)/ninewinecfg.exe.so" |
159 |
- fi |
160 |
-} |