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 65291138331 for ; Sat, 13 Jan 2018 23:15:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97738E08DC; Sat, 13 Jan 2018 23:15:17 +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 6A52AE08DC for ; Sat, 13 Jan 2018 23:15:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 EB864335C46 for ; Sat, 13 Jan 2018 23:15:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 824B11AE for ; Sat, 13 Jan 2018 23:15:14 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1515885300.04620f343c1a03f54685b0848b59f2f2d2b3ffbb.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dolphin/dolphin-9999.ebuild X-VCS-Directories: games-emulation/dolphin/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 04620f343c1a03f54685b0848b59f2f2d2b3ffbb X-VCS-Branch: master Date: Sat, 13 Jan 2018 23:15:14 +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: f5c08e68-1d4d-4089-8798-d37374aa53ab X-Archives-Hash: bd057ea94f4518655f8e24bb947f1a99 commit: 04620f343c1a03f54685b0848b59f2f2d2b3ffbb Author: David Seifert gentoo org> AuthorDate: Sat Jan 13 23:10:13 2018 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Jan 13 23:15:00 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04620f34 games-emulation/dolphin: [QA] Sync live ebuild Package-Manager: Portage-2.3.19, Repoman-2.3.6 games-emulation/dolphin/dolphin-9999.ebuild | 69 ++++++++++------------------- 1 file changed, 24 insertions(+), 45 deletions(-) diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index b726d122197..f6dddcb6d01 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 -PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY nb nl pl pt_BR pt ro_RO ru sr sv tr zh_CN zh_TW" +PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY nb nl pl pt pt_BR ro_RO ru sr sv tr zh_CN zh_TW" PLOCALE_BACKUP="en" WX_GTK_VER="3.0" -inherit cmake-utils eutils l10n pax-utils toolchain-funcs versionator wxwidgets +inherit cmake-utils desktop l10n pax-utils toolchain-funcs versionator wxwidgets -if [[ ${PV} == 9999* ]] +if [[ ${PV} == *9999 ]] then EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin" inherit git-r3 - KEYWORDS="" else SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip" KEYWORDS="~amd64" @@ -24,15 +23,15 @@ HOMEPAGE="https://www.dolphin-emu.org/" LICENSE="GPL-2" SLOT="0" -IUSE="alsa ao bluetooth doc egl +evdev ffmpeg llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets" +IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets" -RDEPEND=">=media-libs/libsfml-2.1 +RDEPEND=" + >=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo - media-libs/libpng:= - sys-libs/glibc - sys-libs/readline:= + media-libs/libpng:0= + sys-libs/readline:0= sys-libs/zlib x11-libs/libXext x11-libs/libXi @@ -44,14 +43,17 @@ RDEPEND=">=media-libs/libsfml-2.1 bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( - dev-libs/libevdev - virtual/udev + dev-libs/libevdev + virtual/udev + ) + ffmpeg? ( + libav? ( media-video/libav:= ) + !libav? ( media-video/ffmpeg:= ) ) - ffmpeg? ( virtual/ffmpeg ) llvm? ( sys-devel/llvm ) openal? ( - media-libs/openal - media-libs/libsoundtouch + media-libs/openal + media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) @@ -64,35 +66,18 @@ RDEPEND=">=media-libs/libsfml-2.1 sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( - dev-libs/glib:2 - x11-libs/gtk+:2 - x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] - ) - " + dev-libs/glib:2 + x11-libs/gtk+:2 + x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] + )" DEPEND="${RDEPEND} - >=dev-util/cmake-2.8.8 - >=sys-devel/gcc-4.9.0 app-arch/zip media-libs/freetype sys-devel/gettext - virtual/pkgconfig - " - -pkg_pretend() { - - local ver=4.9.0 - local msg="${PN} needs at least GCC ${ver} set to compile." - - if [[ ${MERGE_TYPE} != binary ]]; then - if ! version_is_at_least ${ver} $(gcc-fullversion); then - eerror ${msg} - die ${msg} - fi - fi - -} + virtual/pkgconfig" src_prepare() { + cmake-utils_src_prepare # Remove automatic dependencies to prevent building without flags enabled. if use !alsa; then @@ -146,13 +131,12 @@ src_prepare() { } src_configure() { - if use wxwidgets; then need-wxwidgets unicode fi local mycmakeargs=( - "-DUSE_SHARED_ENET=ON" + -DUSE_SHARED_ENET=ON $( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS ) $( cmake-utils_use log FASTLOG ) $( cmake-utils_use profile OPROFILING ) @@ -169,12 +153,7 @@ src_configure() { cmake-utils_src_configure } -src_compile() { - - cmake-utils_src_compile -} src_install() { - cmake-utils_src_install dodoc Readme.md