| 1 |
commit: 12970850eb92aa6d8f212889e3e61de1f397e0cf |
| 2 |
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 2 02:09:31 2018 +0000 |
| 4 |
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 2 02:13:53 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12970850 |
| 7 |
|
| 8 |
app-emulation/wine-vanilla: Sync from ::wine |
| 9 |
|
| 10 |
Bump to 3.1, 3.2. Add GSSAPI and Vulkan support |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/649132 |
| 13 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 14 |
|
| 15 |
app-emulation/wine-vanilla/Manifest | 2 ++ |
| 16 |
app-emulation/wine-vanilla/metadata.xml | 2 ++ |
| 17 |
.../{wine-vanilla-9999.ebuild => wine-vanilla-3.1.ebuild} | 4 +++- |
| 18 |
.../{wine-vanilla-9999.ebuild => wine-vanilla-3.2.ebuild} | 4 +++- |
| 19 |
app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 8 +++++--- |
| 20 |
5 files changed, 15 insertions(+), 5 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest |
| 23 |
index b2f48ea9d7f..340f61e758a 100644 |
| 24 |
--- a/app-emulation/wine-vanilla/Manifest |
| 25 |
+++ b/app-emulation/wine-vanilla/Manifest |
| 26 |
@@ -8,3 +8,5 @@ DIST wine-2.20.tar.xz 19597556 BLAKE2B 80a9886fa77e5788b143521288f7d83c92754610c |
| 27 |
DIST wine-2.21.tar.xz 19620888 BLAKE2B 26d19c5805db58b53530b80eda3ab229f7961542d398cb0e74155e5341de8b484d301c263653ae50e953588538f6782a9b2200b822ba66f091e65d259e07db8e SHA512 4e33c463debe637827ed65f1118e692832bb5374491f706f9d251b8a2956e20d2df5d90ceba218b9bc9e946de91b8ba1d96b460453f59cdd9d82f070d07e0c43 |
| 28 |
DIST wine-2.22.tar.xz 19635032 BLAKE2B 30534fb37ee0fe7b9f20309797240e461f14bc09ef1927e2c03e16cb136b83031ff186d29cc1092600ac53ede9533d0ddad6d4312e501e97201b0c632fedaae5 SHA512 14ecc25c3012c4eb9b1d3207372d0a4187f62593f986caca3196811b8aac0a7b898ae9acd94c707e0d63b6702019cf5051a964ada606b1ff8fb034bb353116bb |
| 29 |
DIST wine-3.0.tar.xz 19712932 BLAKE2B 4478c6781bb171ecca426d1fdc85e0d0bbe13b62b6c983933de55e2abdd0bda7a01cbf251c021824b00129ea6230d1d4e718a64b7d919bb5c07a106b8771adb6 SHA512 a51f41b66f4805e09b223528eff6670e94b9c0c0c947be647507baf9d8d9afe7c3fdc88684c2c8d3573b4739d9a086ab929a744a8594d3c8f6ceb52070f43f0a |
| 30 |
+DIST wine-3.1.tar.xz 19730700 BLAKE2B 287cc42474a9cc57eb7f4b5db2ba79ac5ec8742dffb5367c189f19465cc69bcf78b10fe62ffe6f84ae1360f639a899a7f19128e30e1d9a5b8bbd63deb85e7650 SHA512 49c30d820b8f4028935b4d90dd6251c881cb8cd41bde8833db2782f04111a3d111e24605a87b2d70e419d54cfb6bb42d941f4593f9b381812e3602bf1307c545 |
| 31 |
+DIST wine-3.2.tar.xz 19793180 BLAKE2B 014256734f4c1d70c81115ba6c470f8264746b57be663d81f7e54593fb328a548da00c5e52438af75d923a3c6c5d3997097bd76cf1856b99f0f921f36e5151da SHA512 94b4903d628bf7aacd712a2bf566b53161880bf28311611106776df222222f592edb212d491f02e4c1b0c60d88e4b4a126981d445d1e18018238ff993c6c3092 |
| 32 |
|
| 33 |
diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml |
| 34 |
index 411d8ae7e5d..f0d3a46c5a7 100644 |
| 35 |
--- a/app-emulation/wine-vanilla/metadata.xml |
| 36 |
+++ b/app-emulation/wine-vanilla/metadata.xml |
| 37 |
@@ -21,6 +21,7 @@ This variant of the Wine packaging does not include external patchsets |
| 38 |
<flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag> |
| 39 |
<flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag> |
| 40 |
<flag name="gecko">Add support for the Gecko engine when using iexplore</flag> |
| 41 |
+ <flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag> |
| 42 |
<flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag> |
| 43 |
<flag name="mono">Add support for .NET using Wine's Mono add-on</flag> |
| 44 |
<flag name="netapi">Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag> |
| 45 |
@@ -36,6 +37,7 @@ This variant of the Wine packaging does not include external patchsets |
| 46 |
http://wiki.winehq.org/NtlmAuthSetupGuide and |
| 47 |
http://wiki.winehq.org/NtlmSigningAndSealing</flag> |
| 48 |
<flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag> |
| 49 |
+ <flag name="vulkan">Enable Vulkan drivers</flag> |
| 50 |
</use> |
| 51 |
<upstream> |
| 52 |
<remote-id type="github">wine-compholio/wine-staging</remote-id> |
| 53 |
|
| 54 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild |
| 55 |
similarity index 97% |
| 56 |
copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 57 |
copy to app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild |
| 58 |
index 55dd4bac5b7..1c122ab2e08 100644 |
| 59 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 60 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild |
| 61 |
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} |
| 62 |
|
| 63 |
LICENSE="LGPL-2.1" |
| 64 |
SLOT="${PV}" |
| 65 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm 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 +X +xcomposite xinerama +xml" |
| 66 |
+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 +X +xcomposite xinerama +xml" |
| 67 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
| 68 |
X? ( truetype ) |
| 69 |
elibc_glibc? ( threads ) |
| 70 |
@@ -61,6 +61,7 @@ COMMON_DEPEND=" |
| 71 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
| 72 |
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
| 73 |
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
| 74 |
+ gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
| 75 |
gstreamer? ( |
| 76 |
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] |
| 77 |
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] |
| 78 |
@@ -396,6 +397,7 @@ multilib_src_configure() { |
| 79 |
$(use_enable gecko mshtml) |
| 80 |
$(use_with gphoto2 gphoto) |
| 81 |
$(use_with gsm) |
| 82 |
+ $(use_with gssapi) |
| 83 |
$(use_with gstreamer) |
| 84 |
--without-hal |
| 85 |
$(use_with jpeg) |
| 86 |
|
| 87 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild |
| 88 |
similarity index 97% |
| 89 |
copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 90 |
copy to app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild |
| 91 |
index 55dd4bac5b7..1c122ab2e08 100644 |
| 92 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 93 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild |
| 94 |
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} |
| 95 |
|
| 96 |
LICENSE="LGPL-2.1" |
| 97 |
SLOT="${PV}" |
| 98 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm 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 +X +xcomposite xinerama +xml" |
| 99 |
+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 +X +xcomposite xinerama +xml" |
| 100 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
| 101 |
X? ( truetype ) |
| 102 |
elibc_glibc? ( threads ) |
| 103 |
@@ -61,6 +61,7 @@ COMMON_DEPEND=" |
| 104 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
| 105 |
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
| 106 |
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
| 107 |
+ gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
| 108 |
gstreamer? ( |
| 109 |
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] |
| 110 |
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] |
| 111 |
@@ -396,6 +397,7 @@ multilib_src_configure() { |
| 112 |
$(use_enable gecko mshtml) |
| 113 |
$(use_with gphoto2 gphoto) |
| 114 |
$(use_with gsm) |
| 115 |
+ $(use_with gssapi) |
| 116 |
$(use_with gstreamer) |
| 117 |
--without-hal |
| 118 |
$(use_with jpeg) |
| 119 |
|
| 120 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 121 |
index 55dd4bac5b7..8126d64529b 100644 |
| 122 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 123 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
| 124 |
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} |
| 125 |
|
| 126 |
LICENSE="LGPL-2.1" |
| 127 |
SLOT="${PV}" |
| 128 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm 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 +X +xcomposite xinerama +xml" |
| 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 +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l vulkan +X +xcomposite xinerama +xml" |
| 130 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
| 131 |
X? ( truetype ) |
| 132 |
elibc_glibc? ( threads ) |
| 133 |
@@ -61,6 +61,7 @@ COMMON_DEPEND=" |
| 134 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
| 135 |
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
| 136 |
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
| 137 |
+ gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
| 138 |
gstreamer? ( |
| 139 |
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] |
| 140 |
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] |
| 141 |
@@ -90,6 +91,7 @@ COMMON_DEPEND=" |
| 142 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
| 143 |
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
| 144 |
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) |
| 145 |
+ vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) |
| 146 |
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) |
| 147 |
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
| 148 |
xml? ( |
| 149 |
@@ -157,7 +159,6 @@ PATCHES=( |
| 150 |
"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 |
| 151 |
"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 |
| 152 |
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 |
| 153 |
- "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 |
| 154 |
) |
| 155 |
PATCHES_BIN=() |
| 156 |
|
| 157 |
@@ -338,7 +339,6 @@ src_prepare() { |
| 158 |
l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS |
| 159 |
|
| 160 |
# Fix manpage generation for locales #469418 and abi_x86_64 #617864 |
| 161 |
- # Requires wine-2.0-rearrange-manpages.patch |
| 162 |
|
| 163 |
# Duplicate manpages input files for wine64 |
| 164 |
local f |
| 165 |
@@ -396,6 +396,7 @@ multilib_src_configure() { |
| 166 |
$(use_enable gecko mshtml) |
| 167 |
$(use_with gphoto2 gphoto) |
| 168 |
$(use_with gsm) |
| 169 |
+ $(use_with gssapi) |
| 170 |
$(use_with gstreamer) |
| 171 |
--without-hal |
| 172 |
$(use_with jpeg) |
| 173 |
@@ -419,6 +420,7 @@ multilib_src_configure() { |
| 174 |
$(use_with truetype freetype) |
| 175 |
$(use_with udev) |
| 176 |
$(use_with v4l) |
| 177 |
+ $(use_with vulkan) |
| 178 |
$(use_with X x) |
| 179 |
$(use_with X xfixes) |
| 180 |
$(use_with xcomposite) |
Archives