From 3f71901f8c228f4de570abed1831ce3ee425343e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Sep 2018 10:50:14 +0100 Subject: gentoo resync 08.09.2018 --- games-emulation/dolphin/Manifest | 2 +- games-emulation/dolphin/dolphin-9999.ebuild | 60 ++++++++--------------------- 2 files changed, 17 insertions(+), 45 deletions(-) (limited to 'games-emulation/dolphin') diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest index e349dec51066..4247baad2f0c 100644 --- a/games-emulation/dolphin/Manifest +++ b/games-emulation/dolphin/Manifest @@ -3,5 +3,5 @@ AUX dolphin-5.0-no-pie.patch 1068 BLAKE2B e941c7002b7adaaefc5c9ea2433a1362c1698b AUX dolphin-5.0-xgetbv.patch 1137 BLAKE2B d736d25127fae4c552c1e28b0c152037a2c0a16c59dbec873596e1488f9a9872672684f23517c6ceeef0c8b50e0f1914882a1ccd123660e4458fc9e73d1e07bd SHA512 d627829270acc69ed3dc420c57762c6a68713482c29fd0b33a38864558380c5d9547ace9ab054d2892108ccfe7751147e51c0d5495a57d02fa29c02ac93ef391 DIST dolphin-5.0.zip 41802909 BLAKE2B 57fb7741e86b8b5194c9ccaf99e60be0202429209ce98d08aec4ed1d6f47fb347d9149509de7ac1e4bb28435cba35e357b87cf5d29efe2867706dbb3b903c886 SHA512 36c4f371e066537331a9a8ec4a17befa278465cdebe258e1cbf1157752ba69bff9c1b8a6e8698bbb650aa257bd48b6b42ee9f61357904b09fd01738af8223d3a EBUILD dolphin-5.0.ebuild 4610 BLAKE2B f10b2979143b167887758b6d70db658ce0fe4d9c0bdc57ccc87b16b5682ddebd23f9e14d5fb000b250767bd11487fa13e988b76fd6958cfa56a396c2e5adea4e SHA512 d45ab963c14353014fd9178b61ebecdb017e67ea8e99b252712acbd9732ddb31ae5125ffeaef6cd66276b526dc74955904141a88252682cf34ea3df184ac6746 -EBUILD dolphin-9999.ebuild 4543 BLAKE2B 882e74a625f99b126af0c8ff5c047b0bc659d16f313f8a6b045eb5e746c7058e5f60b8506e1baa7979039e5a0c4a12476fed490752ad8663e92c7eb81b4dd063 SHA512 7a4578076ae71146edc596d1e67d6f6e4f290a3d33edffb980664bae3ec1aae1a2e04887ca95c71a3cd972059cc63dd3b638faf05904978739a1e3062e4a906c +EBUILD dolphin-9999.ebuild 3913 BLAKE2B 5b704e3f68f5942cbbe11d8b1eeffbc4b614e179cd46120357111380f28338345acbbd65d1360e92ae8f0e137e27af21e01382e484651cbcb1a9567b7274384f SHA512 daec7f5ac7c3e113b18d5c83cfe0e30b09a796d15567472657c5ca38171a6781d9b5d718f822ebf4bf395b6d65e7c2681a584f42b280e23a1ef925dd94dafb21 MISC metadata.xml 825 BLAKE2B 47bce78aa687f194ff5fb0252f3cdaf76336ab5460cdf72ddaa2913f36dd69aa916cbfc7684ae276248e14d092d8107ab67c7d8c37b71bfca15778b171d725f2 SHA512 33a3c378f2ed7fd25a155b29a03dd3b87730e9c910e7b2d35148a7f6eafbb75e96eab0a0f9608a9ae34e1aa2ccb5d6cc849d895cd28912c88193640a8ac5a6b5 diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index b8b2dd91a858..b22a98646b70 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -22,16 +22,16 @@ HOMEPAGE="https://www.dolphin-emu.org/" LICENSE="GPL-2" SLOT="0" -IUSE="alsa ao bluetooth discord-presence doc egl +evdev ffmpeg libav log lto openal portaudio profile pulseaudio +qt5 sdl systemd upnp" +IUSE="alsa bluetooth discord-presence doc egl +evdev ffmpeg libav log lto profile pulseaudio +qt5 sdl systemd upnp" RDEPEND=" - >=media-libs/libsfml-2.1 - >net-libs/enet-1.3.7 - >=net-libs/mbedtls-2.1.1:= dev-libs/hidapi:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= + media-libs/libsfml + net-libs/enet:1.3 + net-libs/mbedtls net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= @@ -41,7 +41,6 @@ RDEPEND=" virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) - ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( @@ -52,11 +51,6 @@ RDEPEND=" libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) - openal? ( - media-libs/openal - media-libs/libsoundtouch - ) - portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( @@ -66,7 +60,7 @@ RDEPEND=" ) sdl? ( media-libs/libsdl2[haptic,joystick] ) systemd? ( sys-apps/systemd:0= ) - upnp? ( >=net-libs/miniupnpc-1.7 ) + upnp? ( net-libs/miniupnpc ) " DEPEND="${RDEPEND} app-arch/zip @@ -78,26 +72,6 @@ DEPEND="${RDEPEND} src_prepare() { cmake-utils_src_prepare - # Remove automatic dependencies to prevent building without flags enabled. - if use !alsa; then - sed -i -e '/include(FindALSA/d' CMakeLists.txt || die - fi - if use !ao; then - sed -i -e '/check_lib(AO/d' CMakeLists.txt || die - fi - if use !bluetooth; then - sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die - fi - if use !openal; then - sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die - fi - if use !portaudio; then - sed -i -e '/CMAKE_REQUIRED_LIBRARIES portaudio/d' CMakeLists.txt || die - fi - if use !pulseaudio; then - sed -i -e '/check_lib(PULSEAUDIO/d' CMakeLists.txt || die - fi - # Remove all the bundled libraries that support system-installed # preference. See CMakeLists.txt for conditional 'add_subdirectory' calls. local KEEP_SOURCES=( @@ -141,19 +115,23 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DUSE_SHARED_ENET=ON - -DUSE_DISCORD_PRESENCE=$(usex discord-presence) - -DENCODE_FRAMEDUMPS=$(usex ffmpeg) - -DFASTLOG=$(usex log) - -DOPROFILING=$(usex profile) - + # Use ccache only when user did set FEATURES=ccache (or similar) + # not when ccache binary is present in system (automagic). + -DCCACHE_BIN=CCACHE_BIN-NOTFOUND + -DENABLE_ALSA=$(usex alsa) + -DENABLE_BLUEZ=$(usex bluetooth) -DENABLE_EVDEV=$(usex evdev) + -DENCODE_FRAMEDUMPS=$(usex ffmpeg) -DENABLE_LLVM=OFF -DENABLE_LTO=$(usex lto) + -DENABLE_PULSEAUDIO=$(usex pulseaudio) -DENABLE_QT=$(usex qt5) -DENABLE_SDL=$(usex sdl) - + -DFASTLOG=$(usex log) + -DOPROFILING=$(usex profile) + -DUSE_DISCORD_PRESENCE=$(usex discord-presence) -DUSE_EGL=$(usex egl) + -DUSE_SHARED_ENET=ON -DUSE_UPNP=$(usex upnp) ) @@ -176,12 +154,6 @@ src_install() { pkg_postinst() { # Add pax markings for hardened systems pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu - - if ! use portaudio; then - ewarn "If you want microphone capabilities in dolphin-emu, rebuild with" - ewarn "USE=\"portaudio\"" - fi - gnome2_icon_cache_update } -- cgit v1.2.3