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 BD5301382C5 for ; Tue, 1 May 2018 02:54:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86309E0870; Tue, 1 May 2018 02:54:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 58720E086E for ; Tue, 1 May 2018 02:54:26 +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 6A2B1335C80 for ; Tue, 1 May 2018 02:54:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3F312A2 for ; Tue, 1 May 2018 02:54:23 +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: <1525139604.c6f9b5ac7d5bf0220fd08187cc85c101f5de9909.sarnex@gentoo> Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-any/ X-VCS-Repository: repo/proj/wine X-VCS-Files: app-emulation/wine-any/metadata.xml app-emulation/wine-any/wine-any-9999.ebuild X-VCS-Directories: app-emulation/wine-any/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: c6f9b5ac7d5bf0220fd08187cc85c101f5de9909 X-VCS-Branch: master Date: Tue, 1 May 2018 02:54:23 +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-Archives-Salt: d6da420a-5e73-41bd-85a5-f13c9b3c32a9 X-Archives-Hash: 51651fdb617d7578bbea94b4fd806d30 commit: c6f9b5ac7d5bf0220fd08187cc85c101f5de9909 Author: Nick Sarnie gentoo org> AuthorDate: Tue May 1 01:53:20 2018 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Tue May 1 01:53:24 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=c6f9b5ac app-emulation/wine-any: Updates to 9999 - Added sdl USE - Updated upstream SRC_URI to point to the active fork - Removed unneeded patch exclusion as the patch was dropped upstream Package-Manager: Portage-2.3.31, Repoman-2.3.9 app-emulation/wine-any/metadata.xml | 1 + app-emulation/wine-any/wine-any-9999.ebuild | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app-emulation/wine-any/metadata.xml b/app-emulation/wine-any/metadata.xml index 35b3090..4f3128c 100644 --- a/app-emulation/wine-any/metadata.xml +++ b/app-emulation/wine-any/metadata.xml @@ -45,6 +45,7 @@ This variant of the wine packaging allows for the use of the Wine-Staging patchs Add support for NTLM auth. see http://wiki.winehq.org/NtlmAuthSetupGuide and http://wiki.winehq.org/NtlmSigningAndSealing + 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 Use virtual/libudev to provide plug and play support diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild index d868884..11a4e31 100644 --- a/app-emulation/wine-any/wine-any-9999.ebuild +++ b/app-emulation/wine-any/wine-any-9999.ebuild @@ -38,17 +38,17 @@ SRC_URI="${SRC_URI} " if [[ ${PV} == "9999" ]] ; then - STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git" + STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git" D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git" else SRC_URI="${SRC_URI} - staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz ) + staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )" fi LICENSE="LGPL-2.1" SLOT="${PV}" -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" +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" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -109,6 +109,7 @@ COMMON_DEPEND=" png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) themes? ( @@ -363,7 +364,6 @@ src_prepare() { ewarn "Wine bugzilla should explicitly state that staging was used." local STAGING_EXCLUDE="" - STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132 use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches @@ -484,6 +484,7 @@ multilib_src_configure() { $(use_with pulseaudio pulse) $(use_with threads pthread) $(use_with scanner sane) + $(use_with sdl) $(use_enable test tests) $(use_with truetype freetype) $(use_with udev)