commit: abc61528d74aca60b0909a085b2f0e6cd018b73f
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 4 03:24:49 2020 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Fri Dec 4 03:26:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abc61528
app-emulation/wine-vanilla: Sync with ::wine
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
...5.22-r2.ebuild => wine-vanilla-5.0.3-r1.ebuild} | 51 +++++-----------------
.../wine-vanilla/wine-vanilla-5.22-r2.ebuild | 20 ++++++---
.../wine-vanilla/wine-vanilla-9999.ebuild | 20 ++++++---
3 files changed, 36 insertions(+), 55 deletions(-)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild
similarity index 90%
copy from app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
copy to app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild
index 05ef8ffca0c..5f25770ac60 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild
@@ -19,12 +19,12 @@ if [[ ${PV} == "9999" ]] ; then
#KEYWORDS=""
else
MAJOR_V=$(ver_cut 1)
- SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz";
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz";
KEYWORDS="-* ~amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"
-GWP_V="20200523"
+GWP_V="20191222"
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external
patchsets"
@@ -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
+faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos
kernel_FreeBSD +lcms ldap mingw +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 +unwind 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 +unwind v4l vkd3d
vulkan +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -95,7 +95,7 @@ COMMON_DEPEND="
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
- vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
+ vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
@@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:5.1.1 )
+ mono? ( app-emulation/wine-mono:4.9.4 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
@@ -142,8 +142,8 @@ usr/share/applications/wine-winecfg.desktop"
PATCHES=(
"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+ "${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-
"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
)
PATCHES_BIN=()
@@ -261,34 +261,6 @@ pkg_pretend() {
die
fi
fi
-
- if use mingw && use abi_x86_32 && ! has_version
"cross-i686-w64-mingw32/gcc"; then
- eerror
- eerror "USE=\"mingw\" is currently experimental, and requires
the"
- eerror "'cross-i686-w64-mingw32' compiler and its runtime for
32-bit builds."
- eerror
- eerror "These can be installed by using 'sys-devel/crossdev':"
- eerror
- eerror "crossdev --target i686-w64-mingw32"
- eerror
- eerror "For more information on setting up MinGW, see:
https://wiki.gentoo.org/wiki/Mingw";
- eerror
- die "MinGW build was enabled, but no compiler to support it was
found."
- fi
-
- if use mingw && use abi_x86_64 && ! has_version
"cross-x86_64-w64-mingw32/gcc"; then
- eerror
- eerror "USE=\"mingw\" is currently experimental, and requires
the"
- eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for
64-bit builds."
- eerror
- eerror "These can be installed by using 'sys-devel/crossdev':"
- eerror
- eerror "crossdev --target x86_64-w64-mingw32"
- eerror
- eerror "For more information on setting up MinGW, see:
https://wiki.gentoo.org/wiki/Mingw";
- eerror
- die "MinGW build was enabled, but no compiler to support it was
found."
- fi
}
pkg_setup() {
@@ -382,9 +354,6 @@ src_configure() {
export LDCONFIG=/bin/true
use custom-cflags || strip-flags
- if use mingw; then
- export CROSSCFLAGS="${CFLAGS}"
- fi
multilib-minimal_src_configure
}
@@ -419,8 +388,7 @@ multilib_src_configure() {
$(use_with jpeg)
$(use_with kerberos krb5)
$(use_with ldap)
- # TODO: Will bug 685172 still need special handling?
- $(use_with mingw)
+ --without-mingw # linux LDFLAGS leak in mingw32: bug #685172
$(use_enable mono mscoree)
$(use_with mp3 mpg123)
$(use_with netapi)
@@ -451,9 +419,10 @@ multilib_src_configure() {
$(use_with xml xslt)
)
- local PKG_CONFIG
+ local PKG_CONFIG AR RANLIB
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on
amd64; #472038
- tc-export PKG_CONFIG
+ # set AR and RANLIB to make QA scripts happy; #483342
+ tc-export PKG_CONFIG AR RANLIB
if use amd64; then
if [[ ${ABI} == amd64 ]]; then
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
index 05ef8ffca0c..97ea9019cb1 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.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
+faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos
kernel_FreeBSD +lcms ldap mingw +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 +unwind 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 mingw +mono mp3 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 +unwind v4l vkd3d vulkan
+X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -73,7 +73,6 @@ COMMON_DEPEND="
lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
@@ -405,7 +404,6 @@ multilib_src_configure() {
$(use_with capi)
$(use_with lcms cms)
$(use_with cups)
- $(use_with ncurses curses)
$(use_with udisks dbus)
$(use_with faudio)
$(use_with fontconfig)
@@ -502,12 +500,20 @@ multilib_src_install_all() {
fi
# Remove wineconsole if neither backend is installed #551124
- if ! use X && ! use ncurses; then
+ if ! use X; then
rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
- rm_wineconsole() {
- rm
"${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
- }
+
+ if ! use mingw; then
+ rm_wineconsole() {
+ rm
"${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe*
|| die
+ }
+ else
+ rm_wineconsole() {
+ rm
"${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
+ }
+ fi
+
multilib_foreach_abi rm_wineconsole
fi
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 05ef8ffca0c..97ea9019cb1 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.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
+faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos
kernel_FreeBSD +lcms ldap mingw +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 +unwind 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 mingw +mono mp3 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 +unwind v4l vkd3d vulkan
+X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -73,7 +73,6 @@ COMMON_DEPEND="
lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
@@ -405,7 +404,6 @@ multilib_src_configure() {
$(use_with capi)
$(use_with lcms cms)
$(use_with cups)
- $(use_with ncurses curses)
$(use_with udisks dbus)
$(use_with faudio)
$(use_with fontconfig)
@@ -502,12 +500,20 @@ multilib_src_install_all() {
fi
# Remove wineconsole if neither backend is installed #551124
- if ! use X && ! use ncurses; then
+ if ! use X; then
rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
- rm_wineconsole() {
- rm
"${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
- }
+
+ if ! use mingw; then
+ rm_wineconsole() {
+ rm
"${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe*
|| die
+ }
+ else
+ rm_wineconsole() {
+ rm
"${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
+ }
+ fi
+
multilib_foreach_abi rm_wineconsole
fi
