1 |
commit: 5ddacf93e39d8314ad50927f455076bf176d7379 |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 2 01:31:17 2018 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 2 01:32:36 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ddacf93 |
7 |
|
8 |
app-emulation/wine-d3d9: Sync with ::wine |
9 |
|
10 |
- Add sdl USE flag |
11 |
- Bump to 3.5, 3.6 and 3.7 |
12 |
|
13 |
Package-Manager: Portage-2.3.32, Repoman-2.3.9 |
14 |
|
15 |
app-emulation/wine-d3d9/Manifest | 6 ++++++ |
16 |
app-emulation/wine-d3d9/metadata.xml | 1 + |
17 |
.../wine-d3d9/{wine-d3d9-9999.ebuild => wine-d3d9-3.5.ebuild} | 4 +++- |
18 |
.../wine-d3d9/{wine-d3d9-9999.ebuild => wine-d3d9-3.6.ebuild} | 4 +++- |
19 |
.../wine-d3d9/{wine-d3d9-9999.ebuild => wine-d3d9-3.7.ebuild} | 4 +++- |
20 |
app-emulation/wine-d3d9/wine-d3d9-9999.ebuild | 4 +++- |
21 |
6 files changed, 19 insertions(+), 4 deletions(-) |
22 |
|
23 |
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest |
24 |
index 8178629ecc9..adde10f13a0 100644 |
25 |
--- a/app-emulation/wine-d3d9/Manifest |
26 |
+++ b/app-emulation/wine-d3d9/Manifest |
27 |
@@ -3,7 +3,13 @@ DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b8 |
28 |
DIST wine-2.19.tar.xz 19549464 BLAKE2B 86d130cc43d7d674d2f478365952962b2792fd585b8d074564108bc7e9f4f7690337e4758b9a24e54fe8fd60187d3a96496a5ffc454ba674b02ecdde68efd3bb SHA512 83558231bdc592b1f69cfedf6c689063df7bd9fecdfafba6fb7f6a2c7fa7783973efb85a6a49305afc18b1aa268209ee5b9c0655756e05d7550468698dfa51ae |
29 |
DIST wine-2.20.tar.xz 19597556 BLAKE2B 80a9886fa77e5788b143521288f7d83c92754610c9426e58c759d2c33767bd23f7d2a44a17ceeec0bfe9065264393e0aa1087a0827ea7d438ffd938ba2eb2fb5 SHA512 d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23 |
30 |
DIST wine-2.21.tar.xz 19620888 BLAKE2B 26d19c5805db58b53530b80eda3ab229f7961542d398cb0e74155e5341de8b484d301c263653ae50e953588538f6782a9b2200b822ba66f091e65d259e07db8e SHA512 4e33c463debe637827ed65f1118e692832bb5374491f706f9d251b8a2956e20d2df5d90ceba218b9bc9e946de91b8ba1d96b460453f59cdd9d82f070d07e0c43 |
31 |
+DIST wine-3.5.tar.xz 19963436 BLAKE2B 83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f SHA512 c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f |
32 |
+DIST wine-3.6.tar.xz 20005240 BLAKE2B 6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71 SHA512 31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22 |
33 |
+DIST wine-3.7.tar.xz 20454036 BLAKE2B 04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d SHA512 a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694 |
34 |
DIST wine-d3d9-2.0.tar.gz 48373 BLAKE2B 80370a7519141030a7e54c2ea5db410b2bf1cde8d8389618487c52e4ff40f87cf7b0f9087331bb43fa6436e1b9936de9cc00a02b9ab9ce6528635a245e6a8b3f SHA512 a9e2d1c9f2784128e4c53a8dc923070a5057b5ff3d83c2b536a2d2df0bc8433ac92b8ab1c3cdf34158c0e7bfe497ddb5974605fbc1736a92307639d59450c7a1 |
35 |
DIST wine-d3d9-2.19.tar.gz 48818 BLAKE2B b053ee0ad798a7d8ad53b3daff1757caaa52f095435f2fb89893c7313d490a2359217a5638529e918a1446f13533a746836c1c22218cba875a1420816618408a SHA512 be43435cd53f367ca57080c08218db302a90bf85ec6e917e89375904c456b585b61fb6053f9b4366b7e844f8246cabe83460a9866f614dbb5df3edfb43b2f54a |
36 |
DIST wine-d3d9-2.20.tar.gz 48822 BLAKE2B b9ae137e05f672990707aa3ae88aa569a517e644579ff545b35393074ca03ac0c6aaea7494a90a4f6c4278f7397e1e5078e90383f5debeb4edfe46c8834446ff SHA512 f1fa4882514d0bbb77a7244448a9153cddd5029fca49c5221783fafc13f30888b606c6be4417ecdf85bd80a659ecf54c57ea5aedd49acb87cdc9b42d98f68dc0 |
37 |
DIST wine-d3d9-2.21.tar.gz 48813 BLAKE2B a83b558682f19a44f62c33c8782f4415250c537373654b36c4b1aa6e078ed09594ec1f0e5b76093d88b835786dac96047a1584aa94953256d6ca2804e08ec3df SHA512 64edab41be95adb1dc81c040b13901fbc7fd54467e1306639e3d459c41521d61ebf09e7028688166af8fd0f238063e125d8985a4fc66b185fade996ed596bb2a |
38 |
+DIST wine-d3d9-3.5.tar.gz 50711 BLAKE2B 701f9bcef8f9849c66b567d72b8055522d5a96e4a6581a0da9085df441e9a8907527059e250dfb5630bd605cf451c1f7c60b120f5ce333ff10730f301f7ba70d SHA512 4bde2b510f8726b002dd33af75884eb165b1050338ab553fee071653af343a08d27d338ee42b68600038171d6c645386cde8513fa80c805f8118eb0d9f6c5f4b |
39 |
+DIST wine-d3d9-3.6.tar.gz 50706 BLAKE2B 6d7af8e428de4d0b3d7ec5fc5d157801d3e807cbf63603d8334a564e34b411f2eabba49744670840b12c54a341a9350d1a87f0260b963c9c9392bd81526350e5 SHA512 67ce67e99c0e1c53f9a81074520465e4c59b6c4bb9a9921ce477d65f4e25b62ae85aa32314cf14a1d10a647da9efc72944e5b1ef9bab344e0aac500589f24106 |
40 |
+DIST wine-d3d9-3.7.tar.gz 50699 BLAKE2B 1ab795a0636e7654cc1c96e2a0ba40ff7f89eaa2983d68c4a0eabf3a69355e68e833fee63fbbff67ba840a28d34724a841c1c3c6695ae2d8bcaf38f7fbf4fd16 SHA512 9a02e40bda9c26001857355ddfb1ba68afb518158260b0904c5aaef3991e19587dcc107cc34b01b9fbda7e710be488384b020bbf8d56632cce787ffb299bc3f3 |
41 |
|
42 |
diff --git a/app-emulation/wine-d3d9/metadata.xml b/app-emulation/wine-d3d9/metadata.xml |
43 |
index 0c11e37e8c4..cea9c514b69 100644 |
44 |
--- a/app-emulation/wine-d3d9/metadata.xml |
45 |
+++ b/app-emulation/wine-d3d9/metadata.xml |
46 |
@@ -42,6 +42,7 @@ This variant of the Wine packaging includes the Gallium Nine patchset. |
47 |
<flag name="samba">Add support for NTLM auth. see |
48 |
http://wiki.winehq.org/NtlmAuthSetupGuide and |
49 |
http://wiki.winehq.org/NtlmSigningAndSealing</flag> |
50 |
+ <flag name="sdl">Add support for gamepad detection using SDL</flag> |
51 |
<flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> |
52 |
<flag name="vulkan">Enable Vulkan drivers</flag> |
53 |
</use> |
54 |
|
55 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.5.ebuild |
56 |
similarity index 98% |
57 |
copy from app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
58 |
copy to app-emulation/wine-d3d9/wine-d3d9-3.5.ebuild |
59 |
index b48cb73fb1b..0fba831fcde 100644 |
60 |
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
61 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.5.ebuild |
62 |
@@ -44,7 +44,7 @@ fi |
63 |
|
64 |
LICENSE="LGPL-2.1" |
65 |
SLOT="${PV}" |
66 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" |
67 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" |
68 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
69 |
X? ( truetype ) |
70 |
elibc_glibc? ( threads ) |
71 |
@@ -101,6 +101,7 @@ COMMON_DEPEND=" |
72 |
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
73 |
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
74 |
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) |
75 |
+ sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) |
76 |
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
77 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
78 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
79 |
@@ -429,6 +430,7 @@ multilib_src_configure() { |
80 |
$(use_with pulseaudio pulse) |
81 |
$(use_with threads pthread) |
82 |
$(use_with scanner sane) |
83 |
+ $(use_with sdl) |
84 |
$(use_enable test tests) |
85 |
$(use_with truetype freetype) |
86 |
$(use_with udev) |
87 |
|
88 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.6.ebuild |
89 |
similarity index 98% |
90 |
copy from app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
91 |
copy to app-emulation/wine-d3d9/wine-d3d9-3.6.ebuild |
92 |
index b48cb73fb1b..0fba831fcde 100644 |
93 |
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
94 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.6.ebuild |
95 |
@@ -44,7 +44,7 @@ fi |
96 |
|
97 |
LICENSE="LGPL-2.1" |
98 |
SLOT="${PV}" |
99 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" |
100 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" |
101 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
102 |
X? ( truetype ) |
103 |
elibc_glibc? ( threads ) |
104 |
@@ -101,6 +101,7 @@ COMMON_DEPEND=" |
105 |
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
106 |
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
107 |
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) |
108 |
+ sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) |
109 |
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
110 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
111 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
112 |
@@ -429,6 +430,7 @@ multilib_src_configure() { |
113 |
$(use_with pulseaudio pulse) |
114 |
$(use_with threads pthread) |
115 |
$(use_with scanner sane) |
116 |
+ $(use_with sdl) |
117 |
$(use_enable test tests) |
118 |
$(use_with truetype freetype) |
119 |
$(use_with udev) |
120 |
|
121 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-3.7.ebuild |
122 |
similarity index 98% |
123 |
copy from app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
124 |
copy to app-emulation/wine-d3d9/wine-d3d9-3.7.ebuild |
125 |
index b48cb73fb1b..0fba831fcde 100644 |
126 |
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
127 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.7.ebuild |
128 |
@@ -44,7 +44,7 @@ fi |
129 |
|
130 |
LICENSE="LGPL-2.1" |
131 |
SLOT="${PV}" |
132 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" |
133 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" |
134 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
135 |
X? ( truetype ) |
136 |
elibc_glibc? ( threads ) |
137 |
@@ -101,6 +101,7 @@ COMMON_DEPEND=" |
138 |
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
139 |
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
140 |
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) |
141 |
+ sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) |
142 |
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
143 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
144 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
145 |
@@ -429,6 +430,7 @@ multilib_src_configure() { |
146 |
$(use_with pulseaudio pulse) |
147 |
$(use_with threads pthread) |
148 |
$(use_with scanner sane) |
149 |
+ $(use_with sdl) |
150 |
$(use_enable test tests) |
151 |
$(use_with truetype freetype) |
152 |
$(use_with udev) |
153 |
|
154 |
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
155 |
index b48cb73fb1b..0fba831fcde 100644 |
156 |
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
157 |
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild |
158 |
@@ -44,7 +44,7 @@ fi |
159 |
|
160 |
LICENSE="LGPL-2.1" |
161 |
SLOT="${PV}" |
162 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" |
163 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" |
164 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
165 |
X? ( truetype ) |
166 |
elibc_glibc? ( threads ) |
167 |
@@ -101,6 +101,7 @@ COMMON_DEPEND=" |
168 |
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
169 |
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
170 |
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) |
171 |
+ sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) |
172 |
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
173 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
174 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
175 |
@@ -429,6 +430,7 @@ multilib_src_configure() { |
176 |
$(use_with pulseaudio pulse) |
177 |
$(use_with threads pthread) |
178 |
$(use_with scanner sane) |
179 |
+ $(use_with sdl) |
180 |
$(use_enable test tests) |
181 |
$(use_with truetype freetype) |
182 |
$(use_with udev) |