From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/
Date: Mon, 3 Sep 2018 19:13:10 +0000 (UTC) [thread overview]
Message-ID: <1536001981.7a5765256c9a8cf089c304f1dc4b2fe8fc663842.slyfox@gentoo> (raw)
commit: 7a5765256c9a8cf089c304f1dc4b2fe8fc663842
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 3 19:07:07 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Sep 3 19:13:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a576525
games-emulation/dolphin: update live ebuild
Changes by Samuel Bauer and by Anthony Parsons:
- drop disappeared dependencies and flags: USE="ao openal portaudio"
- drop 'sed' calls and use cmake options instead
- disable automagic ccache autodetection
Bug: https://bugs.gentoo.org/561914
Package-Manager: Portage-2.3.48, Repoman-2.3.10
games-emulation/dolphin/dolphin-9999.ebuild | 49 +++++++----------------------
1 file changed, 12 insertions(+), 37 deletions(-)
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index b8b2dd91a85..2d4a8a1079c 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=(
@@ -155,6 +129,13 @@ src_configure() {
-DUSE_EGL=$(usex egl)
-DUSE_UPNP=$(usex upnp)
+
+ -DENABLE_ALSA=$(usex alsa)
+ -DENABLE_BLUEZ=$(usex bluetooth)
+ # 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_PULSEAUDIO=$(usex pulseaudio)
)
cmake-utils_src_configure
@@ -176,12 +157,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
}
next reply other threads:[~2018-09-03 19:13 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-03 19:13 Sergei Trofimovich [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-13 9:39 [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/ Michał Górny
2025-03-04 19:36 Arthur Zamarin
2025-01-20 4:11 Sam James
2025-01-18 16:34 Michał Górny
2025-01-06 0:53 Sam James
2024-12-28 9:01 Michał Górny
2024-12-26 9:18 Michał Górny
2024-08-17 19:24 Michał Górny
2024-08-11 18:31 Michał Górny
2024-03-04 5:02 Sam James
2023-08-20 17:41 Michał Górny
2023-05-30 10:36 Andreas Sturmlechner
2023-05-23 2:52 Sam James
2022-09-04 23:58 Sam James
2022-07-22 14:24 Ionen Wolkens
2022-07-07 8:30 Ionen Wolkens
2022-06-22 16:02 Arthur Zamarin
2022-05-20 17:13 Michał Górny
2022-05-20 6:41 Michał Górny
2022-04-27 22:10 James Le Cuirot
2022-01-08 10:27 Michał Górny
2022-01-08 10:27 Michał Górny
2021-10-31 0:19 Sam James
2021-09-27 6:55 Agostino Sarubbo
2021-08-08 9:54 Michał Górny
2021-08-08 9:54 Michał Górny
2021-08-08 9:54 Michał Górny
2021-08-08 9:54 Michał Górny
2021-08-08 9:54 Michał Górny
2021-08-08 9:54 Michał Górny
2021-08-08 9:54 Michał Górny
2021-08-08 9:54 Michał Górny
2021-08-08 9:54 Michał Górny
2021-08-08 9:54 Michał Górny
2021-08-06 1:59 Michał Górny
2021-08-05 23:03 Ionen Wolkens
2021-08-04 9:01 Sergei Trofimovich
2021-07-30 7:49 Sergei Trofimovich
2021-07-28 6:45 Sergei Trofimovich
2021-06-19 9:01 Sergei Trofimovich
2021-06-13 6:28 Agostino Sarubbo
2021-05-12 20:14 Sergei Trofimovich
2021-03-28 19:11 Sergei Trofimovich
2020-12-18 20:48 Sergei Trofimovich
2020-12-02 23:21 Sam James
2020-10-24 18:23 Sergei Trofimovich
2020-09-11 7:52 Sergei Trofimovich
2020-08-13 17:51 Sergei Trofimovich
2020-08-10 14:33 Agostino Sarubbo
2020-07-08 17:09 Sergei Trofimovich
2020-07-05 17:26 Sergei Trofimovich
2020-07-05 17:26 Sergei Trofimovich
2020-06-27 13:09 Sergei Trofimovich
2020-05-15 23:12 Sergei Trofimovich
2020-04-25 20:03 Mikle Kolyada
2020-03-20 0:00 Sergei Trofimovich
2020-01-09 19:45 Sergei Trofimovich
2019-11-10 11:10 Sergei Trofimovich
2019-11-10 11:10 Sergei Trofimovich
2019-10-12 20:56 Sergei Trofimovich
2019-06-16 9:14 Sergei Trofimovich
2019-02-14 22:29 Sergei Trofimovich
2018-11-30 20:27 Sergei Trofimovich
2018-11-25 21:45 Sergei Trofimovich
2018-11-25 21:45 Sergei Trofimovich
2018-09-22 17:04 Sergei Trofimovich
2018-09-19 22:17 Sergei Trofimovich
2018-09-03 19:13 Sergei Trofimovich
2018-07-28 17:25 Sergei Trofimovich
2018-07-22 12:27 Sergei Trofimovich
2018-07-08 4:57 David Seifert
2018-01-13 23:15 David Seifert
2018-01-13 23:15 David Seifert
2016-12-19 14:14 Tobias Klausmann
2016-06-25 2:32 Devan Franchini
2016-06-25 2:32 Devan Franchini
2016-05-09 1:44 Michael Sterrett
2016-04-02 19:42 Devan Franchini
2016-04-02 19:42 Devan Franchini
2016-03-05 6:00 Devan Franchini
2016-03-05 5:52 Devan Franchini
2016-01-13 20:49 Devan Franchini
2016-01-07 4:24 Devan Franchini
2016-01-02 1:45 Devan Franchini
2015-12-13 21:19 Devan Franchini
2015-12-12 21:12 Devan Franchini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1536001981.7a5765256c9a8cf089c304f1dc4b2fe8fc663842.slyfox@gentoo \
--to=slyfox@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox