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 6D66E138331 for ; Mon, 30 Apr 2018 03:05:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43D5BE0C1A; Mon, 30 Apr 2018 03:05:34 +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 11DFAE0C1A for ; Mon, 30 Apr 2018 03:05:33 +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 D93BD335C9C for ; Mon, 30 Apr 2018 03:05:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CCCD62A1 for ; Mon, 30 Apr 2018 03:05:30 +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: <1525056973.616353a10a8262f8ee125b306d4429680aaae20a.sarnex@gentoo> Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/ X-VCS-Repository: repo/proj/wine X-VCS-Files: app-emulation/wine-staging/metadata.xml 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: 616353a10a8262f8ee125b306d4429680aaae20a X-VCS-Branch: master Date: Mon, 30 Apr 2018 03:05:30 +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: e2e95da7-3dd1-4507-91e7-e8fb4b5c58c8 X-Archives-Hash: 3c5606055889178334d785802bf5786f commit: 616353a10a8262f8ee125b306d4429680aaae20a Author: Nick Sarnie gentoo org> AuthorDate: Mon Apr 30 02:19:27 2018 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Mon Apr 30 02:56:13 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=616353a1 app-emulation/wine-staging: Updates for 9999 - Added sdl USE - Updated upstream SRC_URI to point to the active fork - Removed unneeded patch exclusion as the patch was dropped upstream Bug: https://bugs.gentoo.org/647970 Package-Manager: Portage-2.3.31, Repoman-2.3.9 app-emulation/wine-staging/metadata.xml | 1 + app-emulation/wine-staging/wine-staging-9999.ebuild | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml index 1295661..de9b63d 100644 --- a/app-emulation/wine-staging/metadata.xml +++ b/app-emulation/wine-staging/metadata.xml @@ -38,6 +38,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset. 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-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index fd41d6c..7ba4e02 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -36,15 +36,15 @@ 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" 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 )" fi 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 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 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 ) @@ -99,6 +99,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? ( @@ -349,7 +350,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 @@ -462,6 +462,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)