From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 41A4D138359 for ; Tue, 24 Nov 2020 03:27:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98297E0827; Tue, 24 Nov 2020 03:27:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 74174E0827 for ; Tue, 24 Nov 2020 03:27:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC077340EF4 for ; Tue, 24 Nov 2020 03:27:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A97842F for ; Tue, 24 Nov 2020 03:27:11 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1606188420.feca0d431897f1433c47c522e4accdc3aff14723.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-staging/metadata.xml app-emulation/wine-staging/wine-staging-5.22-r1.ebuild app-emulation/wine-staging/wine-staging-9999.ebuild X-VCS-Directories: app-emulation/wine-staging/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: feca0d431897f1433c47c522e4accdc3aff14723 X-VCS-Branch: master Date: Tue, 24 Nov 2020 03:27:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fd8036bf-252b-4c82-9209-1736d20ce055 X-Archives-Hash: 0e3e6f11e9d966f7070c1ea4c547d813 commit: feca0d431897f1433c47c522e4accdc3aff14723 Author: Nick Sarnie gentoo org> AuthorDate: Tue Nov 24 03:23:00 2020 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Tue Nov 24 03:27:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feca0d43 app-emulation/wine-staging: Sync with ::wine Add mingw USE Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Nick Sarnie gentoo.org> app-emulation/wine-staging/metadata.xml | 3 +- ...ing-9999.ebuild => wine-staging-5.22-r1.ebuild} | 38 +++++++++++++++++++--- .../wine-staging/wine-staging-9999.ebuild | 33 +++++++++++++++++-- 3 files changed, 67 insertions(+), 7 deletions(-) diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml index 47f226562ce..453fea4e770 100644 --- a/app-emulation/wine-staging/metadata.xml +++ b/app-emulation/wine-staging/metadata.xml @@ -25,6 +25,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset. Add support for the Gecko engine when using iexplore Use GSSAPI (Kerberos SSP support) Use media-libs/gstreamer to provide DirectShow functionality; + Build PE files using a MinGW cross compiler Add support for .NET using Wine's Mono add-on Use libnetapi from net-fs/samba to support Windows networks in netapi32.dll Enable OpenCL support @@ -42,7 +43,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset. (these pages are not currently in the updated WineHQ Wiki). Add support for gamepad detection using SDL Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet - Support GTK+:3 window theming through Wine-Staging + Support GTK+:3 window theming through Wine-Staging Use virtual/libudev to provide plug and play support Use sys-libs/libunwind to unwind the stack Use app-emulation/vkd3d to provide Direct3D 12 support diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-5.22-r1.ebuild similarity index 92% copy from app-emulation/wine-staging/wine-staging-9999.ebuild copy to app-emulation/wine-staging/wine-staging-5.22-r1.ebuild index 11363b6b82b..cf0d7510808 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-5.22-r1.ebuild @@ -44,7 +44,7 @@ fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +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 samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +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 pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -297,6 +297,34 @@ 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() { @@ -455,7 +483,8 @@ multilib_src_configure() { $(use_with jpeg) $(use_with kerberos krb5) $(use_with ldap) - --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 + # TODO: Will bug 685172 still need special handling? + $(use_with mingw) $(use_enable mono mscoree) $(use_with mp3 mpg123) $(use_with netapi) @@ -492,9 +521,10 @@ multilib_src_configure() { $(use_with vaapi va) ) - 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-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 11363b6b82b..df834fec4d8 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -44,7 +44,7 @@ fi LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +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 samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +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 pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -297,6 +297,34 @@ 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() { @@ -455,7 +483,8 @@ multilib_src_configure() { $(use_with jpeg) $(use_with kerberos krb5) $(use_with ldap) - --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 + # TODO: Will bug 685172 still need special handling? + $(use_with mingw) $(use_enable mono mscoree) $(use_with mp3 mpg123) $(use_with netapi)