1 |
commit: 43c1e51f4c9570c8d401606e77ec8292ae0bb4ba |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 30 01:54:19 2018 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 30 01:56:56 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43c1e51f |
7 |
|
8 |
app-emulation/wine-vanilla: Sync with ::wine |
9 |
|
10 |
Bump to 3.5, 3.6, 3.7 and add sdl USE |
11 |
|
12 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
13 |
|
14 |
app-emulation/wine-vanilla/Manifest | 3 +++ |
15 |
app-emulation/wine-vanilla/metadata.xml | 1 + |
16 |
.../{wine-vanilla-9999.ebuild => wine-vanilla-3.5.ebuild} | 4 +++- |
17 |
.../{wine-vanilla-9999.ebuild => wine-vanilla-3.6.ebuild} | 4 +++- |
18 |
.../{wine-vanilla-9999.ebuild => wine-vanilla-3.7.ebuild} | 4 +++- |
19 |
app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 4 +++- |
20 |
6 files changed, 16 insertions(+), 4 deletions(-) |
21 |
|
22 |
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest |
23 |
index 340f61e758a..5e0453c1e0f 100644 |
24 |
--- a/app-emulation/wine-vanilla/Manifest |
25 |
+++ b/app-emulation/wine-vanilla/Manifest |
26 |
@@ -10,3 +10,6 @@ DIST wine-2.22.tar.xz 19635032 BLAKE2B 30534fb37ee0fe7b9f20309797240e461f14bc09e |
27 |
DIST wine-3.0.tar.xz 19712932 BLAKE2B 4478c6781bb171ecca426d1fdc85e0d0bbe13b62b6c983933de55e2abdd0bda7a01cbf251c021824b00129ea6230d1d4e718a64b7d919bb5c07a106b8771adb6 SHA512 a51f41b66f4805e09b223528eff6670e94b9c0c0c947be647507baf9d8d9afe7c3fdc88684c2c8d3573b4739d9a086ab929a744a8594d3c8f6ceb52070f43f0a |
28 |
DIST wine-3.1.tar.xz 19730700 BLAKE2B 287cc42474a9cc57eb7f4b5db2ba79ac5ec8742dffb5367c189f19465cc69bcf78b10fe62ffe6f84ae1360f639a899a7f19128e30e1d9a5b8bbd63deb85e7650 SHA512 49c30d820b8f4028935b4d90dd6251c881cb8cd41bde8833db2782f04111a3d111e24605a87b2d70e419d54cfb6bb42d941f4593f9b381812e3602bf1307c545 |
29 |
DIST wine-3.2.tar.xz 19793180 BLAKE2B 014256734f4c1d70c81115ba6c470f8264746b57be663d81f7e54593fb328a548da00c5e52438af75d923a3c6c5d3997097bd76cf1856b99f0f921f36e5151da SHA512 94b4903d628bf7aacd712a2bf566b53161880bf28311611106776df222222f592edb212d491f02e4c1b0c60d88e4b4a126981d445d1e18018238ff993c6c3092 |
30 |
+DIST wine-3.5.tar.xz 19963436 BLAKE2B 83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f SHA512 c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f |
31 |
+DIST wine-3.6.tar.xz 20005240 BLAKE2B 6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71 SHA512 31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22 |
32 |
+DIST wine-3.7.tar.xz 20454036 BLAKE2B 04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d SHA512 a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694 |
33 |
|
34 |
diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml |
35 |
index f0d3a46c5a7..78e364679eb 100644 |
36 |
--- a/app-emulation/wine-vanilla/metadata.xml |
37 |
+++ b/app-emulation/wine-vanilla/metadata.xml |
38 |
@@ -36,6 +36,7 @@ This variant of the Wine packaging does not include external patchsets |
39 |
<flag name="samba">Add support for NTLM auth. see |
40 |
http://wiki.winehq.org/NtlmAuthSetupGuide and |
41 |
http://wiki.winehq.org/NtlmSigningAndSealing</flag> |
42 |
+ <flag name="sdl">Add support for gamepad detection using SDL</flag> |
43 |
<flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> |
44 |
<flag name="vulkan">Enable Vulkan drivers</flag> |
45 |
</use> |
46 |
|
47 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild |
48 |
similarity index 98% |
49 |
copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
50 |
copy to app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild |
51 |
index 62ef97c197e..9bebca2da60 100644 |
52 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
53 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.5.ebuild |
54 |
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} |
55 |
|
56 |
LICENSE="LGPL-2.1" |
57 |
SLOT="${PV}" |
58 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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" |
59 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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" |
60 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
61 |
X? ( truetype ) |
62 |
elibc_glibc? ( threads ) |
63 |
@@ -86,6 +86,7 @@ COMMON_DEPEND=" |
64 |
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
65 |
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
66 |
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) |
67 |
+ sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) |
68 |
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
69 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
70 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
71 |
@@ -396,6 +397,7 @@ multilib_src_configure() { |
72 |
$(use_with pulseaudio pulse) |
73 |
$(use_with threads pthread) |
74 |
$(use_with scanner sane) |
75 |
+ $(use_with sdl) |
76 |
$(use_enable test tests) |
77 |
$(use_with truetype freetype) |
78 |
$(use_with udev) |
79 |
|
80 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.6.ebuild |
81 |
similarity index 98% |
82 |
copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
83 |
copy to app-emulation/wine-vanilla/wine-vanilla-3.6.ebuild |
84 |
index 62ef97c197e..9bebca2da60 100644 |
85 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
86 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.6.ebuild |
87 |
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} |
88 |
|
89 |
LICENSE="LGPL-2.1" |
90 |
SLOT="${PV}" |
91 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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" |
92 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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" |
93 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
94 |
X? ( truetype ) |
95 |
elibc_glibc? ( threads ) |
96 |
@@ -86,6 +86,7 @@ COMMON_DEPEND=" |
97 |
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
98 |
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
99 |
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) |
100 |
+ sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) |
101 |
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
102 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
103 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
104 |
@@ -396,6 +397,7 @@ multilib_src_configure() { |
105 |
$(use_with pulseaudio pulse) |
106 |
$(use_with threads pthread) |
107 |
$(use_with scanner sane) |
108 |
+ $(use_with sdl) |
109 |
$(use_enable test tests) |
110 |
$(use_with truetype freetype) |
111 |
$(use_with udev) |
112 |
|
113 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.7.ebuild |
114 |
similarity index 98% |
115 |
copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
116 |
copy to app-emulation/wine-vanilla/wine-vanilla-3.7.ebuild |
117 |
index 62ef97c197e..9bebca2da60 100644 |
118 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
119 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.7.ebuild |
120 |
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} |
121 |
|
122 |
LICENSE="LGPL-2.1" |
123 |
SLOT="${PV}" |
124 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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" |
125 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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" |
126 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
127 |
X? ( truetype ) |
128 |
elibc_glibc? ( threads ) |
129 |
@@ -86,6 +86,7 @@ COMMON_DEPEND=" |
130 |
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
131 |
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
132 |
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) |
133 |
+ sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) |
134 |
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
135 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
136 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
137 |
@@ -396,6 +397,7 @@ multilib_src_configure() { |
138 |
$(use_with pulseaudio pulse) |
139 |
$(use_with threads pthread) |
140 |
$(use_with scanner sane) |
141 |
+ $(use_with sdl) |
142 |
$(use_enable test tests) |
143 |
$(use_with truetype freetype) |
144 |
$(use_with udev) |
145 |
|
146 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
147 |
index 62ef97c197e..9bebca2da60 100644 |
148 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
149 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
150 |
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} |
151 |
|
152 |
LICENSE="LGPL-2.1" |
153 |
SLOT="${PV}" |
154 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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" |
155 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags 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" |
156 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
157 |
X? ( truetype ) |
158 |
elibc_glibc? ( threads ) |
159 |
@@ -86,6 +86,7 @@ COMMON_DEPEND=" |
160 |
png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
161 |
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
162 |
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) |
163 |
+ sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) |
164 |
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
165 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
166 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
167 |
@@ -396,6 +397,7 @@ multilib_src_configure() { |
168 |
$(use_with pulseaudio pulse) |
169 |
$(use_with threads pthread) |
170 |
$(use_with scanner sane) |
171 |
+ $(use_with sdl) |
172 |
$(use_enable test tests) |
173 |
$(use_with truetype freetype) |
174 |
$(use_with udev) |