1 |
commit: 7a5765256c9a8cf089c304f1dc4b2fe8fc663842 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 3 19:07:07 2018 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 3 19:13:01 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a576525 |
7 |
|
8 |
games-emulation/dolphin: update live ebuild |
9 |
|
10 |
Changes by Samuel Bauer and by Anthony Parsons: |
11 |
- drop disappeared dependencies and flags: USE="ao openal portaudio" |
12 |
- drop 'sed' calls and use cmake options instead |
13 |
- disable automagic ccache autodetection |
14 |
|
15 |
Bug: https://bugs.gentoo.org/561914 |
16 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
17 |
|
18 |
games-emulation/dolphin/dolphin-9999.ebuild | 49 +++++++---------------------- |
19 |
1 file changed, 12 insertions(+), 37 deletions(-) |
20 |
|
21 |
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild |
22 |
index b8b2dd91a85..2d4a8a1079c 100644 |
23 |
--- a/games-emulation/dolphin/dolphin-9999.ebuild |
24 |
+++ b/games-emulation/dolphin/dolphin-9999.ebuild |
25 |
@@ -22,16 +22,16 @@ HOMEPAGE="https://www.dolphin-emu.org/" |
26 |
|
27 |
LICENSE="GPL-2" |
28 |
SLOT="0" |
29 |
-IUSE="alsa ao bluetooth discord-presence doc egl +evdev ffmpeg libav log lto openal portaudio profile pulseaudio +qt5 sdl systemd upnp" |
30 |
+IUSE="alsa bluetooth discord-presence doc egl +evdev ffmpeg libav log lto profile pulseaudio +qt5 sdl systemd upnp" |
31 |
|
32 |
RDEPEND=" |
33 |
- >=media-libs/libsfml-2.1 |
34 |
- >net-libs/enet-1.3.7 |
35 |
- >=net-libs/mbedtls-2.1.1:= |
36 |
dev-libs/hidapi:0= |
37 |
dev-libs/lzo:2= |
38 |
dev-libs/pugixml:0= |
39 |
media-libs/libpng:0= |
40 |
+ media-libs/libsfml |
41 |
+ net-libs/enet:1.3 |
42 |
+ net-libs/mbedtls |
43 |
net-misc/curl:0= |
44 |
sys-libs/readline:0= |
45 |
sys-libs/zlib:0= |
46 |
@@ -41,7 +41,6 @@ RDEPEND=" |
47 |
virtual/libusb:1 |
48 |
virtual/opengl |
49 |
alsa? ( media-libs/alsa-lib ) |
50 |
- ao? ( media-libs/libao ) |
51 |
bluetooth? ( net-wireless/bluez ) |
52 |
egl? ( media-libs/mesa[egl] ) |
53 |
evdev? ( |
54 |
@@ -52,11 +51,6 @@ RDEPEND=" |
55 |
libav? ( media-video/libav:= ) |
56 |
!libav? ( media-video/ffmpeg:= ) |
57 |
) |
58 |
- openal? ( |
59 |
- media-libs/openal |
60 |
- media-libs/libsoundtouch |
61 |
- ) |
62 |
- portaudio? ( media-libs/portaudio ) |
63 |
profile? ( dev-util/oprofile ) |
64 |
pulseaudio? ( media-sound/pulseaudio ) |
65 |
qt5? ( |
66 |
@@ -66,7 +60,7 @@ RDEPEND=" |
67 |
) |
68 |
sdl? ( media-libs/libsdl2[haptic,joystick] ) |
69 |
systemd? ( sys-apps/systemd:0= ) |
70 |
- upnp? ( >=net-libs/miniupnpc-1.7 ) |
71 |
+ upnp? ( net-libs/miniupnpc ) |
72 |
" |
73 |
DEPEND="${RDEPEND} |
74 |
app-arch/zip |
75 |
@@ -78,26 +72,6 @@ DEPEND="${RDEPEND} |
76 |
src_prepare() { |
77 |
cmake-utils_src_prepare |
78 |
|
79 |
- # Remove automatic dependencies to prevent building without flags enabled. |
80 |
- if use !alsa; then |
81 |
- sed -i -e '/include(FindALSA/d' CMakeLists.txt || die |
82 |
- fi |
83 |
- if use !ao; then |
84 |
- sed -i -e '/check_lib(AO/d' CMakeLists.txt || die |
85 |
- fi |
86 |
- if use !bluetooth; then |
87 |
- sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die |
88 |
- fi |
89 |
- if use !openal; then |
90 |
- sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die |
91 |
- fi |
92 |
- if use !portaudio; then |
93 |
- sed -i -e '/CMAKE_REQUIRED_LIBRARIES portaudio/d' CMakeLists.txt || die |
94 |
- fi |
95 |
- if use !pulseaudio; then |
96 |
- sed -i -e '/check_lib(PULSEAUDIO/d' CMakeLists.txt || die |
97 |
- fi |
98 |
- |
99 |
# Remove all the bundled libraries that support system-installed |
100 |
# preference. See CMakeLists.txt for conditional 'add_subdirectory' calls. |
101 |
local KEEP_SOURCES=( |
102 |
@@ -155,6 +129,13 @@ src_configure() { |
103 |
|
104 |
-DUSE_EGL=$(usex egl) |
105 |
-DUSE_UPNP=$(usex upnp) |
106 |
+ |
107 |
+ -DENABLE_ALSA=$(usex alsa) |
108 |
+ -DENABLE_BLUEZ=$(usex bluetooth) |
109 |
+ # Use ccache only when user did set FEATURES=ccache (or similar) |
110 |
+ # not when ccache binary is present in system (automagic). |
111 |
+ -DCCACHE_BIN=CCACHE_BIN-NOTFOUND |
112 |
+ -DENABLE_PULSEAUDIO=$(usex pulseaudio) |
113 |
) |
114 |
|
115 |
cmake-utils_src_configure |
116 |
@@ -176,12 +157,6 @@ src_install() { |
117 |
pkg_postinst() { |
118 |
# Add pax markings for hardened systems |
119 |
pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu |
120 |
- |
121 |
- if ! use portaudio; then |
122 |
- ewarn "If you want microphone capabilities in dolphin-emu, rebuild with" |
123 |
- ewarn "USE=\"portaudio\"" |
124 |
- fi |
125 |
- |
126 |
gnome2_icon_cache_update |
127 |
} |