Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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-any/
Date: Tue, 01 May 2018 02:57:43
Message-Id: 1525143450.a56530253f7591085159e05cd3769f6550e7d747.sarnex@gentoo
1 commit: a56530253f7591085159e05cd3769f6550e7d747
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 1 02:51:31 2018 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Tue May 1 02:57:30 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5653025
7
8 app-emulation/wine-any: 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-any/Manifest | 9 +++++++++
18 app-emulation/wine-any/metadata.xml | 1 +
19 .../wine-any/{wine-any-9999.ebuild => wine-any-3.5.ebuild} | 9 +++++----
20 .../wine-any/{wine-any-9999.ebuild => wine-any-3.6.ebuild} | 9 +++++----
21 .../wine-any/{wine-any-9999.ebuild => wine-any-3.7.ebuild} | 9 +++++----
22 app-emulation/wine-any/wine-any-9999.ebuild | 9 +++++----
23 6 files changed, 30 insertions(+), 16 deletions(-)
24
25 diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
26 index 4cefebde19a..0ac9bb36bdc 100644
27 --- a/app-emulation/wine-any/Manifest
28 +++ b/app-emulation/wine-any/Manifest
29 @@ -3,11 +3,20 @@ 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-d3d9-2.0.tar.gz 48373 BLAKE2B 80370a7519141030a7e54c2ea5db410b2bf1cde8d8389618487c52e4ff40f87cf7b0f9087331bb43fa6436e1b9936de9cc00a02b9ab9ce6528635a245e6a8b3f SHA512 a9e2d1c9f2784128e4c53a8dc923070a5057b5ff3d83c2b536a2d2df0bc8433ac92b8ab1c3cdf34158c0e7bfe497ddb5974605fbc1736a92307639d59450c7a1
37 DIST wine-d3d9-2.19.tar.gz 48818 BLAKE2B b053ee0ad798a7d8ad53b3daff1757caaa52f095435f2fb89893c7313d490a2359217a5638529e918a1446f13533a746836c1c22218cba875a1420816618408a SHA512 be43435cd53f367ca57080c08218db302a90bf85ec6e917e89375904c456b585b61fb6053f9b4366b7e844f8246cabe83460a9866f614dbb5df3edfb43b2f54a
38 DIST wine-d3d9-2.20.tar.gz 48822 BLAKE2B b9ae137e05f672990707aa3ae88aa569a517e644579ff545b35393074ca03ac0c6aaea7494a90a4f6c4278f7397e1e5078e90383f5debeb4edfe46c8834446ff SHA512 f1fa4882514d0bbb77a7244448a9153cddd5029fca49c5221783fafc13f30888b606c6be4417ecdf85bd80a659ecf54c57ea5aedd49acb87cdc9b42d98f68dc0
39 DIST wine-d3d9-2.21.tar.gz 48813 BLAKE2B a83b558682f19a44f62c33c8782f4415250c537373654b36c4b1aa6e078ed09594ec1f0e5b76093d88b835786dac96047a1584aa94953256d6ca2804e08ec3df SHA512 64edab41be95adb1dc81c040b13901fbc7fd54467e1306639e3d459c41521d61ebf09e7028688166af8fd0f238063e125d8985a4fc66b185fade996ed596bb2a
40 +DIST wine-d3d9-3.5.tar.gz 50711 BLAKE2B 701f9bcef8f9849c66b567d72b8055522d5a96e4a6581a0da9085df441e9a8907527059e250dfb5630bd605cf451c1f7c60b120f5ce333ff10730f301f7ba70d SHA512 4bde2b510f8726b002dd33af75884eb165b1050338ab553fee071653af343a08d27d338ee42b68600038171d6c645386cde8513fa80c805f8118eb0d9f6c5f4b
41 +DIST wine-d3d9-3.6.tar.gz 50706 BLAKE2B 6d7af8e428de4d0b3d7ec5fc5d157801d3e807cbf63603d8334a564e34b411f2eabba49744670840b12c54a341a9350d1a87f0260b963c9c9392bd81526350e5 SHA512 67ce67e99c0e1c53f9a81074520465e4c59b6c4bb9a9921ce477d65f4e25b62ae85aa32314cf14a1d10a647da9efc72944e5b1ef9bab344e0aac500589f24106
42 +DIST wine-d3d9-3.7.tar.gz 50699 BLAKE2B 1ab795a0636e7654cc1c96e2a0ba40ff7f89eaa2983d68c4a0eabf3a69355e68e833fee63fbbff67ba840a28d34724a841c1c3c6695ae2d8bcaf38f7fbf4fd16 SHA512 9a02e40bda9c26001857355ddfb1ba68afb518158260b0904c5aaef3991e19587dcc107cc34b01b9fbda7e710be488384b020bbf8d56632cce787ffb299bc3f3
43 DIST wine-staging-2.0.tar.gz 10182575 BLAKE2B 1de645f66fa3e5e0d8ceddf5439fd246510470f63d6331c7029abed7192180b7b8430e43a2e732a30a5fbe0c73ba39b7fafcfc08830c68e679dff90576c3a960 SHA512 51412299259d6e92c8993543d5fdb3239ebe31e0d1d715e0a9e8ce94b3139c0567b08ff1600d41be94f12427cbfccc2f6b6b2ed030535445c95618aaf6578580
44 DIST wine-staging-2.19.tar.gz 10241240 BLAKE2B e661e3272328988e9a1aacc22fc02f0773804b58777f208c79c6af866032f31b6140a52e2aa5af954e52437db234712863d1369e960e98e2c212d1efc7f6344f SHA512 90916cb096bbfec35514eff4c1b6e2090b6e68e3e7af1164715f5abb1d255c5cfd6411f53c27cb277adcf0982fa6d6e508a7cdbc1404dcca6c2700b05c2c5483
45 DIST wine-staging-2.20.tar.gz 10240761 BLAKE2B 2a212e59c606f4c53e711b0f975a9527cbb930423061eeeb962c3bba7232890f3f4853e1aa98cba11bcb9c9ba6a37c915ef8df7f4f3d3243da96f625e6d45a57 SHA512 16f55130291ca70487a74d01cee9057f95f3eae3e049d30fb2a9aeb8e425b2020289fb805fdbae860708be0615a86da0502c06ff32cc21536d040088cc13605f
46 DIST wine-staging-2.21.tar.gz 10229454 BLAKE2B a971b9b96e1e57f658b492e3dd5d6daf5410b6bb6a7df9432d14b48e6ca4b21a4ab62ee362addf370ea5940e4f7a6af05ec6c026124cb9e9b6cc790f7fc8e204 SHA512 701c6352c8bc5745b8078947bcc3b6209e4e6c387905395cc81d42276402243522d7fa543bb34293c74786adcde9a3c50a2cf4cd57e05e0f4c68991a49a00b41
47 +DIST wine-staging-3.5.tar.gz 10024748 BLAKE2B b5399bd22fd1edc1e22ee82e19bb9e54d4d12e771cfa0578dfc69d5cc18c0b6c1dba8e9c522ffddd14c187e012f33196738035dd34b45d71f48eac96997fd8b5 SHA512 39ce4fccac408d69c55fe53376744d218d546d09fc3fcaa5c8e87ba070de5ed52128ebdf0ed76cb5e3a5178a79c8fb25a8786b129e8b3eb59156732d7a4bf15c
48 +DIST wine-staging-3.6.tar.gz 9958882 BLAKE2B 9f7d3d6d748f7bceb08a584bc93a1ce97c09d13cf5448ed1fbe1981494e0009e4686f047d8005a059522ec78749dd120f29f7c6562da8578a95a5dda91c23895 SHA512 839731fa3dba91cefd9e0f036b4d688c4786fe8cb19143819457fb9e45a6c14ef3a70630b585abdd424a00036312114034a2529700012ea1863527e45fbfac2a
49 +DIST wine-staging-3.7.tar.gz 9951654 BLAKE2B 3d6c9a023f3a4f9da6e506a88490365d4f0959231e7f9e375e8ae46006c3cfd82ca4e65af9df79d9c54cf7ee5e53452b10ac5146f2c0de97a7c4946aefac3cd5 SHA512 4a00b7c61121798b6c4e918aadeb71865e359f6471035b9ed33ae242f3fe70f1977b1c0b3628fb244b5ba4942d771d2ee797bcc087d38192fcd9325e1886ed14
50
51 diff --git a/app-emulation/wine-any/metadata.xml b/app-emulation/wine-any/metadata.xml
52 index 35b3090be7e..4f3128c71c6 100644
53 --- a/app-emulation/wine-any/metadata.xml
54 +++ b/app-emulation/wine-any/metadata.xml
55 @@ -45,6 +45,7 @@ This variant of the wine packaging allows for the use of the Wine-Staging patchs
56 <flag name="samba">Add support for NTLM auth. see
57 http://wiki.winehq.org/NtlmAuthSetupGuide and
58 http://wiki.winehq.org/NtlmSigningAndSealing</flag>
59 + <flag name="sdl">Add support for gamepad detection using SDL</flag>
60 <flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag>
61 <flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag>
62 <flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag>
63
64 diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-3.5.ebuild
65 similarity index 97%
66 copy from app-emulation/wine-any/wine-any-9999.ebuild
67 copy to app-emulation/wine-any/wine-any-3.5.ebuild
68 index d8688841e0a..11a4e315f58 100644
69 --- a/app-emulation/wine-any/wine-any-9999.ebuild
70 +++ b/app-emulation/wine-any/wine-any-3.5.ebuild
71 @@ -38,17 +38,17 @@ SRC_URI="${SRC_URI}
72 "
73
74 if [[ ${PV} == "9999" ]] ; then
75 - STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git"
76 + STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
77 D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
78 else
79 SRC_URI="${SRC_URI}
80 - staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
81 + staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
82 d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
83 fi
84
85 LICENSE="LGPL-2.1"
86 SLOT="${PV}"
87 -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 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"
88 +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 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"
89 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
90 X? ( truetype )
91 elibc_glibc? ( threads )
92 @@ -109,6 +109,7 @@ COMMON_DEPEND="
93 png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
94 pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
95 scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
96 + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
97 ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
98 staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
99 themes? (
100 @@ -363,7 +364,6 @@ src_prepare() {
101 ewarn "Wine bugzilla should explicitly state that staging was used."
102
103 local STAGING_EXCLUDE=""
104 - STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
105 use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
106
107 # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
108 @@ -484,6 +484,7 @@ multilib_src_configure() {
109 $(use_with pulseaudio pulse)
110 $(use_with threads pthread)
111 $(use_with scanner sane)
112 + $(use_with sdl)
113 $(use_enable test tests)
114 $(use_with truetype freetype)
115 $(use_with udev)
116
117 diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-3.6.ebuild
118 similarity index 97%
119 copy from app-emulation/wine-any/wine-any-9999.ebuild
120 copy to app-emulation/wine-any/wine-any-3.6.ebuild
121 index d8688841e0a..11a4e315f58 100644
122 --- a/app-emulation/wine-any/wine-any-9999.ebuild
123 +++ b/app-emulation/wine-any/wine-any-3.6.ebuild
124 @@ -38,17 +38,17 @@ SRC_URI="${SRC_URI}
125 "
126
127 if [[ ${PV} == "9999" ]] ; then
128 - STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git"
129 + STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
130 D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
131 else
132 SRC_URI="${SRC_URI}
133 - staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
134 + staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
135 d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
136 fi
137
138 LICENSE="LGPL-2.1"
139 SLOT="${PV}"
140 -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 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"
141 +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 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"
142 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
143 X? ( truetype )
144 elibc_glibc? ( threads )
145 @@ -109,6 +109,7 @@ COMMON_DEPEND="
146 png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
147 pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
148 scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
149 + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
150 ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
151 staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
152 themes? (
153 @@ -363,7 +364,6 @@ src_prepare() {
154 ewarn "Wine bugzilla should explicitly state that staging was used."
155
156 local STAGING_EXCLUDE=""
157 - STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
158 use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
159
160 # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
161 @@ -484,6 +484,7 @@ multilib_src_configure() {
162 $(use_with pulseaudio pulse)
163 $(use_with threads pthread)
164 $(use_with scanner sane)
165 + $(use_with sdl)
166 $(use_enable test tests)
167 $(use_with truetype freetype)
168 $(use_with udev)
169
170 diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-3.7.ebuild
171 similarity index 97%
172 copy from app-emulation/wine-any/wine-any-9999.ebuild
173 copy to app-emulation/wine-any/wine-any-3.7.ebuild
174 index d8688841e0a..11a4e315f58 100644
175 --- a/app-emulation/wine-any/wine-any-9999.ebuild
176 +++ b/app-emulation/wine-any/wine-any-3.7.ebuild
177 @@ -38,17 +38,17 @@ SRC_URI="${SRC_URI}
178 "
179
180 if [[ ${PV} == "9999" ]] ; then
181 - STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git"
182 + STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
183 D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
184 else
185 SRC_URI="${SRC_URI}
186 - staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
187 + staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
188 d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
189 fi
190
191 LICENSE="LGPL-2.1"
192 SLOT="${PV}"
193 -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 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"
194 +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 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"
195 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
196 X? ( truetype )
197 elibc_glibc? ( threads )
198 @@ -109,6 +109,7 @@ COMMON_DEPEND="
199 png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
200 pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
201 scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
202 + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
203 ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
204 staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
205 themes? (
206 @@ -363,7 +364,6 @@ src_prepare() {
207 ewarn "Wine bugzilla should explicitly state that staging was used."
208
209 local STAGING_EXCLUDE=""
210 - STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
211 use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
212
213 # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
214 @@ -484,6 +484,7 @@ multilib_src_configure() {
215 $(use_with pulseaudio pulse)
216 $(use_with threads pthread)
217 $(use_with scanner sane)
218 + $(use_with sdl)
219 $(use_enable test tests)
220 $(use_with truetype freetype)
221 $(use_with udev)
222
223 diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild
224 index d8688841e0a..11a4e315f58 100644
225 --- a/app-emulation/wine-any/wine-any-9999.ebuild
226 +++ b/app-emulation/wine-any/wine-any-9999.ebuild
227 @@ -38,17 +38,17 @@ SRC_URI="${SRC_URI}
228 "
229
230 if [[ ${PV} == "9999" ]] ; then
231 - STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git"
232 + STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
233 D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
234 else
235 SRC_URI="${SRC_URI}
236 - staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
237 + staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
238 d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
239 fi
240
241 LICENSE="LGPL-2.1"
242 SLOT="${PV}"
243 -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 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"
244 +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 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"
245 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
246 X? ( truetype )
247 elibc_glibc? ( threads )
248 @@ -109,6 +109,7 @@ COMMON_DEPEND="
249 png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
250 pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
251 scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
252 + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
253 ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
254 staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
255 themes? (
256 @@ -363,7 +364,6 @@ src_prepare() {
257 ewarn "Wine bugzilla should explicitly state that staging was used."
258
259 local STAGING_EXCLUDE=""
260 - STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
261 use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
262
263 # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
264 @@ -484,6 +484,7 @@ multilib_src_configure() {
265 $(use_with pulseaudio pulse)
266 $(use_with threads pthread)
267 $(use_with scanner sane)
268 + $(use_with sdl)
269 $(use_enable test tests)
270 $(use_with truetype freetype)
271 $(use_with udev)
Report Message
Find on MARC Find on Google Groups