commit: 309e47698e7ca594e9eacc90bad503df782e17e8
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 20:30:15 2019 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 20:32:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=309e4769
app-emulation/wine-vanilla: Sync with ::wine
Bump to 4.3, 4.4
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
app-emulation/wine-vanilla/Manifest | 3 +++
app-emulation/wine-vanilla/metadata.xml | 1 +
.../{wine-vanilla-9999.ebuild => wine-vanilla-4.3.ebuild} | 4 +++-
.../{wine-vanilla-9999.ebuild => wine-vanilla-4.4.ebuild} | 10 ++++++----
app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 10 ++++++----
5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/app-emulation/wine-vanilla/Manifest
b/app-emulation/wine-vanilla/Manifest
index e6da6f53dc4..0fd87e4be6d 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,4 +1,5 @@
DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B
84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6
SHA512
5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
+DIST gentoo-wine-patches-20190316.tar.xz 58848 BLAKE2B
76e66749638589dd6d6eceb4b78690483d14353597a4e47fe9e5325d8bdb2bceff66040c110f63b8bae698bc5838c280c048ff7375ba2ed8cc387cbe0422c79a
SHA512
de2cf844ae686144c3f95f0a360c7fa8a62185500758f994b5a65836798bdc3092138dcd9c36d0267a6fcfdc13585258d31b281244a97b45965f40e0f2b29eda
DIST wine-3.0.3.tar.xz 19735412 BLAKE2B
f0ccbe272f1013386f89805cf1573cf001eb875bccb31a1884fad1dff5f90caf727c460406af80f63db7a227d85f25f57c8e8e650a171adbe0c3f5178ddf17e8
SHA512
11043a9a9434681f9c73590688b600b3b9e3d311be2c4d97b5f58f0740500ebcfbdc826bd6584d5dd392dccbdd9389ffa04c8fedbba43a4df2e6aeb922414412
DIST wine-3.0.4.tar.xz 20556944 BLAKE2B
122c06e38cae9f9d2358908d0d325ed4e0dc3d1bf3e189fcfd1a713ca147d5360934cc21c387939bb5ba6dec9410d85b586d95207089b6aa033eea15bfc209e3
SHA512
e1ce33bbc165a9c640a38965a229b757b67746f2150d545eb0e29ba6d21cdf150bd8eb9a450d8dd71733fbea3b2ac24839dd8e381b7da9cd15ddf98c59304198
DIST wine-3.20.tar.xz 21541928 BLAKE2B
9183dacd1c6ec15ae5283eca3d17db5a869bcba9a93800a422f0dea5d9cfb5d3124a3e942e8b6487cd4ba31cfeacdd66de39128dd66d64e1226d265eae922d3a
SHA512
fb66d1d4b427f46dd048b13e53bcd15a5eaeb19039221fe98ec771140c33b3c245a974e52242eab5731ffa0de15f5932204032fe24f86e1a313ff8f11da59cc4
@@ -6,3 +7,5 @@ DIST wine-3.21.tar.xz 21573872 BLAKE2B
54d8733b19f1377f856c9496f6263eef1916e03ca
DIST wine-4.0.tar.xz 21644692 BLAKE2B
9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3
SHA512
7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
DIST wine-4.1.tar.xz 21680916 BLAKE2B
1a040606e34e1aec6f63d9692c6cbf915f5b32c817116aed68203e6bdedb8cb129dad440f7e51e9fb2ebaf1aa537d1584333f06b8b2c5d68f9ff37921d5b8b95
SHA512
2b28fc82111552009a042d682ea8f4e54d90f14bb99f1fbe12732090e7562527c229683562630edada0b1f4143de226734337b20d1b23d711191dcc0a834e4dc
DIST wine-4.2.tar.xz 21724960 BLAKE2B
d3c4381265e5086a17582c28fd4d19c84ed8e9839d039d5f2eba32efcc09ae6dad2a25fa375042d98d35de30065eaa0095e36bb8fbca608ec74abc654bae5196
SHA512
408a846e92a0222f64ddd3c4d2c2a71b387ce51749e346c1fbca1fd57db910fa18dc6bb4ce0a350bef81e13be77c6b2d74537f7a1c0dcbb0e6d4c19d1ade288c
+DIST wine-4.3.tar.xz 21764500 BLAKE2B
dd94b710f2be20ce3225fb58e0a20f0ee46e59834dc77383e262620faa64597c41625382237c39563b3bb67b1850cca2460ca147e2c5ee3052f0fdfdee067ec5
SHA512
45c0519f8f2873ef65e1761d518a7148f3aa54c0e993a41a60849c01c8df17386d57edd83308cff289300adc6a8e3fc5918fb12513f5b85a88e556b420479e83
+DIST wine-4.4.tar.xz 21805668 BLAKE2B
cf973240a3f2a1ad1cac8690cdc5cd86be428220395d90bfe3b15567e6a2be0bb78e5828de3b77b617827122f5b0bb1dfeeef351102ca001722340ceaeb5625e
SHA512
6678c9b0e086bdc9fab9f9fd2517226352b49f846bbae7be6000bb60db2f302aad49622192077b45880d45ad33ba4d82bfe3403fb82a1e65159f1352b40933de
diff --git a/app-emulation/wine-vanilla/metadata.xml
b/app-emulation/wine-vanilla/metadata.xml
index c601705c294..ae58a3f5b90 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -20,6 +20,7 @@ This variant of the Wine packaging does not include external
patchsets
<flag name="capi">Enable ISDN support via CAPI</flag>
<flag name="custom-cflags">Bypass strip-flags; use at your own
peril</flag>
<flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to
run DOS applications</flag>
+ <flag name="faudio">Pull in <pkg>app-emulation/faudio</pkg> to
provide XAudio2 functionality</flag>
<flag name="gecko">Add support for the Gecko engine when using
iexplore</flag>
<flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag>
<flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to
provide DirectShow functionality;</flag>
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-4.3.ebuild
similarity index 97%
copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
copy to app-emulation/wine-vanilla/wine-vanilla-4.3.ebuild
index bb002c1e3be..6397e0c6edf 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.3.ebuild
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="${PV}"
-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 vkd3d vulkan +X
+xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc
faudio +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 vkd3d vulkan
+X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -59,6 +59,7 @@ COMMON_DEPEND="
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
@@ -374,6 +375,7 @@ multilib_src_configure() {
$(use_with cups)
$(use_with ncurses curses)
$(use_with udisks dbus)
+ $(use_with faudio)
$(use_with fontconfig)
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-4.4.ebuild
similarity index 96%
copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
copy to app-emulation/wine-vanilla/wine-vanilla-4.4.ebuild
index bb002c1e3be..fbc64fd1e68 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.4.ebuild
@@ -24,18 +24,18 @@ else
fi
S="${WORKDIR}/${MY_P}"
-GWP_V="20180120"
+GWP_V="20190316"
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external
patchsets"
HOMEPAGE="https://www.winehq.org/";
SRC_URI="${SRC_URI}
-
https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+
https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
"
LICENSE="LGPL-2.1"
SLOT="${PV}"
-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 vkd3d vulkan +X
+xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc
faudio +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 vkd3d vulkan
+X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -59,6 +59,7 @@ COMMON_DEPEND="
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
@@ -138,7 +139,7 @@ usr/share/applications/wine-uninstaller.desktop
usr/share/applications/wine-winecfg.desktop"
PATCHES=(
- "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+ "${PATCHDIR}/patches/${MY_PN}-4.4-winegcc.patch" #260726
"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
@@ -374,6 +375,7 @@ multilib_src_configure() {
$(use_with cups)
$(use_with ncurses curses)
$(use_with udisks dbus)
+ $(use_with faudio)
$(use_with fontconfig)
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index bb002c1e3be..fbc64fd1e68 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -24,18 +24,18 @@ else
fi
S="${WORKDIR}/${MY_P}"
-GWP_V="20180120"
+GWP_V="20190316"
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external
patchsets"
HOMEPAGE="https://www.winehq.org/";
SRC_URI="${SRC_URI}
-
https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+
https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
"
LICENSE="LGPL-2.1"
SLOT="${PV}"
-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 vkd3d vulkan +X
+xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc
faudio +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 vkd3d vulkan
+X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -59,6 +59,7 @@ COMMON_DEPEND="
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
@@ -138,7 +139,7 @@ usr/share/applications/wine-uninstaller.desktop
usr/share/applications/wine-winecfg.desktop"
PATCHES=(
- "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+ "${PATCHDIR}/patches/${MY_PN}-4.4-winegcc.patch" #260726
"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
@@ -374,6 +375,7 @@ multilib_src_configure() {
$(use_with cups)
$(use_with ncurses curses)
$(use_with udisks dbus)
+ $(use_with faudio)
$(use_with fontconfig)
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
