Gentoo Archives: gentoo-commits

From: Nick Sarnie <sarnex@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/
Date: Mon, 30 Apr 2018 03:13:09
Message-Id: 1525057970.11af8c1d0ab69222db6c18035ea841653ed4f7e4.sarnex@gentoo
1 commit: 11af8c1d0ab69222db6c18035ea841653ed4f7e4
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 30 03:08:45 2018 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 30 03:12:50 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11af8c1d
7
8 app-emulation/wine-staging: Sync with ::wine
9
10 - Added sdl USE flag
11 - Fixed staging SRC_URI to point to the active fork
12 - Removed unneeded patch exclusion as the patch was dropped upstream
13 - Bumped to 3.5, 3.6 and 3.7
14
15 Package-Manager: Portage-2.3.31, Repoman-2.3.9
16
17 app-emulation/wine-staging/Manifest | 6 ++++++
18 app-emulation/wine-staging/metadata.xml | 1 +
19 .../{wine-staging-9999.ebuild => wine-staging-3.5.ebuild} | 9 +++++----
20 .../{wine-staging-9999.ebuild => wine-staging-3.6.ebuild} | 9 +++++----
21 .../{wine-staging-9999.ebuild => wine-staging-3.7.ebuild} | 9 +++++----
22 app-emulation/wine-staging/wine-staging-9999.ebuild | 9 +++++----
23 6 files changed, 27 insertions(+), 16 deletions(-)
24
25 diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
26 index 66bfe168421..5a948b439a6 100644
27 --- a/app-emulation/wine-staging/Manifest
28 +++ b/app-emulation/wine-staging/Manifest
29 @@ -3,7 +3,13 @@ DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b8
30 DIST wine-2.19.tar.xz 19549464 BLAKE2B 86d130cc43d7d674d2f478365952962b2792fd585b8d074564108bc7e9f4f7690337e4758b9a24e54fe8fd60187d3a96496a5ffc454ba674b02ecdde68efd3bb SHA512 83558231bdc592b1f69cfedf6c689063df7bd9fecdfafba6fb7f6a2c7fa7783973efb85a6a49305afc18b1aa268209ee5b9c0655756e05d7550468698dfa51ae
31 DIST wine-2.20.tar.xz 19597556 BLAKE2B 80a9886fa77e5788b143521288f7d83c92754610c9426e58c759d2c33767bd23f7d2a44a17ceeec0bfe9065264393e0aa1087a0827ea7d438ffd938ba2eb2fb5 SHA512 d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23
32 DIST wine-2.21.tar.xz 19620888 BLAKE2B 26d19c5805db58b53530b80eda3ab229f7961542d398cb0e74155e5341de8b484d301c263653ae50e953588538f6782a9b2200b822ba66f091e65d259e07db8e SHA512 4e33c463debe637827ed65f1118e692832bb5374491f706f9d251b8a2956e20d2df5d90ceba218b9bc9e946de91b8ba1d96b460453f59cdd9d82f070d07e0c43
33 +DIST wine-3.5.tar.xz 19963436 BLAKE2B 83d7c0719a088f8c705f7a9d8a6df6b9ee5e0a5ffa57c0a921875097be29298bebb9025222039432c65da32359e187a93413e04a5bb73171f0033911595baf9f SHA512 c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
34 +DIST wine-3.6.tar.xz 20005240 BLAKE2B 6dd48180b9aed8a3b69c40b3ed7b2ff5adbebfb591860dda6603d2219f9059bc069df000cd2614c80d34911c451388f0124af3dd8a11b806b227ca8e16659d71 SHA512 31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
35 +DIST wine-3.7.tar.xz 20454036 BLAKE2B 04ac94d5679377c5d0bb37a6d3e8e3ec7c09faa300f8422a09a22b14ef4244d2bb14c80a47cfca5e11526506a8064f0cfa4e28868d7f04669f85ab743dbbb36d SHA512 a699418574dd8f407c064421cf6cdfe3923562c8adf9a7749e716f3853291eab05358ea64f0217c303c26c0f8f59d2116024b7b6978f9a52a055147e689a8694
36 DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960 SHA512 51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
37 DIST wine-staging-2.19.tar.gz 10241240 BLAKE2B e661e3272328988e9a1aacc22fc02f0773804b58777f208c79c6af866032f31b6140a52e2aa5af954e52437db234712863d1369e960e98e2c212d1efc7f6344f SHA512 90916cb096bbfec35514eff4c1b6e2090b6e68e3e7af1164715f5abb1d255c5cfd6411f53c27cb277adcf0982fa6d6e508a7cdbc1404dcca6c2700b05c2c5483
38 DIST wine-staging-2.20.tar.gz 10240761 BLAKE2B 2a212e59c606f4c53e711b0f975a9527cbb930423061eeeb962c3bba7232890f3f4853e1aa98cba11bcb9c9ba6a37c915ef8df7f4f3d3243da96f625e6d45a57 SHA512 16f55130291ca70487a74d01cee9057f95f3eae3e049d30fb2a9aeb8e425b2020289fb805fdbae860708be0615a86da0502c06ff32cc21536d040088cc13605f
39 DIST wine-staging-2.21.tar.gz 10229454 BLAKE2B a971b9b96e1e57f658b492e3dd5d6daf5410b6bb6a7df9432d14b48e6ca4b21a4ab62ee362addf370ea5940e4f7a6af05ec6c026124cb9e9b6cc790f7fc8e204 SHA512 701c6352c8bc5745b8078947bcc3b6209e4e6c387905395cc81d42276402243522d7fa543bb34293c74786adcde9a3c50a2cf4cd57e05e0f4c68991a49a00b41
40 +DIST wine-staging-3.5.tar.gz 10024748 BLAKE2B b5399bd22fd1edc1e22ee82e19bb9e54d4d12e771cfa0578dfc69d5cc18c0b6c1dba8e9c522ffddd14c187e012f33196738035dd34b45d71f48eac96997fd8b5 SHA512 39ce4fccac408d69c55fe53376744d218d546d09fc3fcaa5c8e87ba070de5ed52128ebdf0ed76cb5e3a5178a79c8fb25a8786b129e8b3eb59156732d7a4bf15c
41 +DIST wine-staging-3.6.tar.gz 9958882 BLAKE2B 9f7d3d6d748f7bceb08a584bc93a1ce97c09d13cf5448ed1fbe1981494e0009e4686f047d8005a059522ec78749dd120f29f7c6562da8578a95a5dda91c23895 SHA512 839731fa3dba91cefd9e0f036b4d688c4786fe8cb19143819457fb9e45a6c14ef3a70630b585abdd424a00036312114034a2529700012ea1863527e45fbfac2a
42 +DIST wine-staging-3.7.tar.gz 9951654 BLAKE2B 3d6c9a023f3a4f9da6e506a88490365d4f0959231e7f9e375e8ae46006c3cfd82ca4e65af9df79d9c54cf7ee5e53452b10ac5146f2c0de97a7c4946aefac3cd5 SHA512 4a00b7c61121798b6c4e918aadeb71865e359f6471035b9ed33ae242f3fe70f1977b1c0b3628fb244b5ba4942d771d2ee797bcc087d38192fcd9325e1886ed14
43
44 diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml
45 index 1295661b4ce..de9b63d0867 100644
46 --- a/app-emulation/wine-staging/metadata.xml
47 +++ b/app-emulation/wine-staging/metadata.xml
48 @@ -38,6 +38,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset.
49 <flag name="samba">Add support for NTLM auth. see
50 http://wiki.winehq.org/NtlmAuthSetupGuide and
51 http://wiki.winehq.org/NtlmSigningAndSealing</flag>
52 + <flag name="sdl">Add support for gamepad detection using SDL</flag>
53 <flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag>
54 <flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag>
55 <flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag>
56
57 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-3.5.ebuild
58 similarity index 97%
59 copy from app-emulation/wine-staging/wine-staging-9999.ebuild
60 copy to app-emulation/wine-staging/wine-staging-3.5.ebuild
61 index fd41d6cfdb2..7ba4e022173 100644
62 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
63 +++ b/app-emulation/wine-staging/wine-staging-3.5.ebuild
64 @@ -36,15 +36,15 @@ SRC_URI="${SRC_URI}
65 "
66
67 if [[ ${PV} == "9999" ]] ; then
68 - STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git"
69 + STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
70 else
71 SRC_URI="${SRC_URI}
72 - staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
73 + staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
74 fi
75
76 LICENSE="LGPL-2.1"
77 SLOT="${PV}"
78 -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 pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vulkan +X +xcomposite xinerama +xml"
79 +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 pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vulkan +X +xcomposite xinerama +xml"
80 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
81 X? ( truetype )
82 elibc_glibc? ( threads )
83 @@ -99,6 +99,7 @@ COMMON_DEPEND="
84 png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
85 pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
86 scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
87 + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
88 ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
89 staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
90 themes? (
91 @@ -349,7 +350,6 @@ src_prepare() {
92 ewarn "Wine bugzilla should explicitly state that staging was used."
93
94 local STAGING_EXCLUDE=""
95 - STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
96 use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
97
98 # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
99 @@ -462,6 +462,7 @@ multilib_src_configure() {
100 $(use_with pulseaudio pulse)
101 $(use_with threads pthread)
102 $(use_with scanner sane)
103 + $(use_with sdl)
104 $(use_enable test tests)
105 $(use_with truetype freetype)
106 $(use_with udev)
107
108 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-3.6.ebuild
109 similarity index 97%
110 copy from app-emulation/wine-staging/wine-staging-9999.ebuild
111 copy to app-emulation/wine-staging/wine-staging-3.6.ebuild
112 index fd41d6cfdb2..7ba4e022173 100644
113 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
114 +++ b/app-emulation/wine-staging/wine-staging-3.6.ebuild
115 @@ -36,15 +36,15 @@ SRC_URI="${SRC_URI}
116 "
117
118 if [[ ${PV} == "9999" ]] ; then
119 - STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git"
120 + STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
121 else
122 SRC_URI="${SRC_URI}
123 - staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
124 + staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
125 fi
126
127 LICENSE="LGPL-2.1"
128 SLOT="${PV}"
129 -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 pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vulkan +X +xcomposite xinerama +xml"
130 +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 pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vulkan +X +xcomposite xinerama +xml"
131 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
132 X? ( truetype )
133 elibc_glibc? ( threads )
134 @@ -99,6 +99,7 @@ COMMON_DEPEND="
135 png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
136 pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
137 scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
138 + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
139 ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
140 staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
141 themes? (
142 @@ -349,7 +350,6 @@ src_prepare() {
143 ewarn "Wine bugzilla should explicitly state that staging was used."
144
145 local STAGING_EXCLUDE=""
146 - STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
147 use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
148
149 # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
150 @@ -462,6 +462,7 @@ multilib_src_configure() {
151 $(use_with pulseaudio pulse)
152 $(use_with threads pthread)
153 $(use_with scanner sane)
154 + $(use_with sdl)
155 $(use_enable test tests)
156 $(use_with truetype freetype)
157 $(use_with udev)
158
159 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-3.7.ebuild
160 similarity index 97%
161 copy from app-emulation/wine-staging/wine-staging-9999.ebuild
162 copy to app-emulation/wine-staging/wine-staging-3.7.ebuild
163 index fd41d6cfdb2..7ba4e022173 100644
164 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
165 +++ b/app-emulation/wine-staging/wine-staging-3.7.ebuild
166 @@ -36,15 +36,15 @@ SRC_URI="${SRC_URI}
167 "
168
169 if [[ ${PV} == "9999" ]] ; then
170 - STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git"
171 + STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
172 else
173 SRC_URI="${SRC_URI}
174 - staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
175 + staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
176 fi
177
178 LICENSE="LGPL-2.1"
179 SLOT="${PV}"
180 -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 pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vulkan +X +xcomposite xinerama +xml"
181 +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 pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vulkan +X +xcomposite xinerama +xml"
182 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
183 X? ( truetype )
184 elibc_glibc? ( threads )
185 @@ -99,6 +99,7 @@ COMMON_DEPEND="
186 png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
187 pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
188 scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
189 + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
190 ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
191 staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
192 themes? (
193 @@ -349,7 +350,6 @@ src_prepare() {
194 ewarn "Wine bugzilla should explicitly state that staging was used."
195
196 local STAGING_EXCLUDE=""
197 - STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
198 use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
199
200 # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
201 @@ -462,6 +462,7 @@ multilib_src_configure() {
202 $(use_with pulseaudio pulse)
203 $(use_with threads pthread)
204 $(use_with scanner sane)
205 + $(use_with sdl)
206 $(use_enable test tests)
207 $(use_with truetype freetype)
208 $(use_with udev)
209
210 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
211 index fd41d6cfdb2..7ba4e022173 100644
212 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
213 +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
214 @@ -36,15 +36,15 @@ SRC_URI="${SRC_URI}
215 "
216
217 if [[ ${PV} == "9999" ]] ; then
218 - STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git"
219 + STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
220 else
221 SRC_URI="${SRC_URI}
222 - staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
223 + staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
224 fi
225
226 LICENSE="LGPL-2.1"
227 SLOT="${PV}"
228 -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 pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vulkan +X +xcomposite xinerama +xml"
229 +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 pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vulkan +X +xcomposite xinerama +xml"
230 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
231 X? ( truetype )
232 elibc_glibc? ( threads )
233 @@ -99,6 +99,7 @@ COMMON_DEPEND="
234 png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
235 pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
236 scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
237 + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
238 ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
239 staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
240 themes? (
241 @@ -349,7 +350,6 @@ src_prepare() {
242 ewarn "Wine bugzilla should explicitly state that staging was used."
243
244 local STAGING_EXCLUDE=""
245 - STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
246 use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
247
248 # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
249 @@ -462,6 +462,7 @@ multilib_src_configure() {
250 $(use_with pulseaudio pulse)
251 $(use_with threads pthread)
252 $(use_with scanner sane)
253 + $(use_with sdl)
254 $(use_enable test tests)
255 $(use_with truetype freetype)
256 $(use_with udev)