subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: games\-emulation\/dolphin\/"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2024-03-03 Thread Sam James

commit: b34a8017a0faa59faac8d19621c7e9ff1fb9402e
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 05:01:39 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 05:01:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34a8017

games-emulation/dolphin: filter LTO with USE=gui

Interaction between Qt and LTO.

Bug: https://bugs.dolphin-emu.org/issues/11481
Bug: https://bugreports.qt.io/browse/QTBUG-61710
Closes: https://bugs.gentoo.org/891225
Signed-off-by: Sam James  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild | 7 +--
 games-emulation/dolphin/dolphin-.ebuild | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild
index af6e7afd45e0..c1f43ed2cbd5 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake desktop xdg-utils pax-utils
+inherit cmake desktop flag-o-matic xdg-utils pax-utils
 
 if [[ ${PV} == * ]]
 then
@@ -153,6 +153,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # bug #891225 (https://bugs.dolphin-emu.org/issues/11481, QTBUG-61710)
+   use gui && filter-lto
+
local mycmakeargs=(
# Use ccache only when user did set FEATURES=ccache (or similar)
# not when ccache binary is present in system (automagic).

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 690c3afb5517..25bf321c0c70 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake desktop xdg-utils pax-utils
+inherit cmake desktop flag-o-matic xdg-utils pax-utils
 
 if [[ ${PV} == * ]]
 then
@@ -151,6 +151,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # bug #891225 (https://bugs.dolphin-emu.org/issues/11481, QTBUG-61710)
+   use gui && filter-lto
+
local mycmakeargs=(
# Use ccache only when user did set FEATURES=ccache (or similar)
# not when ccache binary is present in system (automagic).

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2023-08-20 Thread Michał Górny

commit: 3856158147f0bf938064a3d6b6bea52bfce4107c
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug 20 17:37:38 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug 20 17:41:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38561581

games-emulation/dolphin: Add slot op on media-libs/libsfml dep

Signed-off-by: Michał Górny  gentoo.org>

 ...olphin-5.0_p20220520-r1.ebuild => dolphin-5.0_p20220520-r2.ebuild} | 4 ++--
 games-emulation/dolphin/dolphin-.ebuild   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild
similarity index 98%
rename from games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
rename to games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild
index 1660b4e0497e..af6e7afd45e0 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,7 +47,7 @@ RDEPEND="
dev-libs/pugixml:=
media-libs/cubeb:=
media-libs/libpng:=
-   media-libs/libsfml
+   media-libs/libsfml:=
media-libs/mesa[egl(+)]
net-libs/enet:1.3
net-libs/mbedtls:=

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 38913a1d3125..690c3afb5517 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
dev-libs/pugixml:=
media-libs/cubeb:=
media-libs/libpng:=
-   media-libs/libsfml
+   media-libs/libsfml:=
media-libs/mesa[egl(+)]
net-libs/enet:1.3
net-libs/mbedtls:=

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2023-05-30 Thread Andreas Sturmlechner

commit: b7cf06bed49c56c628b9d18d7d48090a15befcbe
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May 29 09:43:37 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 30 10:33:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7cf06be

games-emulation/dolphin: Switch IUSE=pulseaudio to media-libs/libpulse

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index ebe6fb575460..38913a1d3125 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -70,7 +70,7 @@ RDEPEND="
dev-qt/qtwidgets:5
)
profile? ( dev-util/oprofile )
-   pulseaudio? ( media-sound/pulseaudio )
+   pulseaudio? ( media-libs/libpulse )
systemd? ( sys-apps/systemd:0= )
upnp? ( net-libs/miniupnpc )
 "

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2023-05-22 Thread Sam James

commit: 8c08287c3ba983fb82a54cdacea0e6ccd0d3c60c
Author: Sam James  gentoo  org>
AuthorDate: Tue May 23 02:43:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 23 02:51:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c08287c

games-emulation/dolphin: defer to new global USE=vulkan description

Signed-off-by: Sam James  gentoo.org>

 games-emulation/dolphin/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-emulation/dolphin/metadata.xml 
b/games-emulation/dolphin/metadata.xml
index f6526509705e..da1b3b2107be 100644
--- a/games-emulation/dolphin/metadata.xml
+++ b/games-emulation/dolphin/metadata.xml
@@ -14,7 +14,6 @@
Enable evdev input support
Increase logging output
Enables GBA controllers emulation using 
libmgba.
-   Enable support for Vulkan-based video 
backend.


Dolphin is a Gamecube and Wii emulator. Most games run 
perfectly or with

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/files/, games-emulation/dolphin/

2022-09-04 Thread Michał Górny

commit: aef1e63af94bd8da749aaef6ad6baf04c683622d
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Sep  5 05:31:20 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Sep  5 05:31:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef1e63a

games-emulation/dolphin: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 games-emulation/dolphin/Manifest   |   1 -
 .../dolphin/dolphin-5.0_p20210506-r3.ebuild| 196 -
 .../dolphin/files/dolphin-5.0_p20210506-musl.patch |  24 ---
 3 files changed, 221 deletions(-)

diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index eaf5b6495ec4..a50d52217ba3 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,3 +1,2 @@
-DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B 
bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862
 SHA512 
5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f
 DIST dolphin-5.0_p20220520.tar.gz 34880474 BLAKE2B 
925cddfe8a5d6febced5721bea6ced7c8d2855619f74ca8940b95dc78ea523b4a1083b9ef6efe3561d833b8e9ecb742cb2adf5a1864c06b629b3ecd9e92cc871
 SHA512 
4993cb10061b142f6627c96493885a5f9d88857d8949c2e8e8d5df5ba6e19b4f98d199da5e641d3d61294884e1cbbe8191bc5b4445c60bf80723046b2524aad5
 DIST mgba-40d4c430fc36caeb7ea32fd39624947ed487d2f2.tar.gz 12921593 BLAKE2B 
8c5cf7b9b53f897f6248ad6bc51efafaa8a9d5df137d42d30f4b042b6d1527049644595938626c8cae1385d329bc45bf42db8dcc4424b963a3899e0df53246eb
 SHA512 
26d7b60cbc7415652bb9ca2a42ccd532856867db57bf6dd91d8204551970109b6b9f4a96c42d643ea96b9d071d6aec924d3c1bb79c251c95183b7fb8536456c9

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
deleted file mode 100644
index 6ff4a8dd29b9..
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg-utils pax-utils
-
-if [[ ${PV} == * ]]
-then
-   EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin;
-   inherit git-r3
-else
-   EGIT_COMMIT=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68
-   SRC_URI="
-   
https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz
-   -> ${P}.tar.gz"
-   S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-   KEYWORDS="amd64 ~arm64"
-fi
-
-DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://dolphin-emu.org/;
-
-LICENSE="GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT ZLIB"
-SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log
-   profile pulseaudio systemd upnp vulkan"
-
-RDEPEND="
-   dev-libs/hidapi:0=
-   https://bugs.gentoo.org/799281
-https://github.com/dolphin-emu/dolphin/commit/7a1922fd8f0f6686188d179732c9757faf2d1b4f.patch
-
-From 7a1922fd8f0f6686188d179732c9757faf2d1b4f Mon Sep 17 00:00:00 2001
-From: thyrc 
-Date: Mon, 14 Jun 2021 10:18:34 +0200
-Subject: [PATCH] Fix includes for musl libc
-

- Source/Core/Core/MemoryWatcher.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/Core/Core/MemoryWatcher.cpp 
b/Source/Core/Core/MemoryWatcher.cpp
-index 491ecd83150a..13843e2021ca 100644
 a/Source/Core/Core/MemoryWatcher.cpp
-+++ b/Source/Core/Core/MemoryWatcher.cpp
-@@ -2,6 +2,7 @@
- // Licensed under GPLv2+
- // Refer to the license.txt file included.
- 
-+#include 
- #include 
- #include 
- #include

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2022-09-04 Thread Sam James

commit: 8ed770ca38d0a647daaf351655d53ec94bdfc2e1
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  4 23:57:37 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  4 23:57:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ed770ca

games-emulation/dolphin: Stabilize 5.0_p20220520-r1 amd64, #868453

Signed-off-by: Sam James  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
index 5d4b0219d150..1660b4e0497e 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
@@ -22,7 +22,7 @@ else
)
"
S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-   KEYWORDS="~amd64 ~arm64"
+   KEYWORDS="amd64 ~arm64"
 fi
 
 DESCRIPTION="Gamecube and Wii game emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2022-07-22 Thread Ionen Wolkens

commit: 5af0627f94f7f9088def4f47b9737bddd51e43b4
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jul 22 14:12:41 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jul 22 14:23:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af0627f

games-emulation/dolphin: disable qt6 automagic

In advance before Qt6 is in tree, works fine with 6 but don't
want it to be automagic without proper dependency checks.

Was hoping for a non-sed way to handle this but due to the method
used we can't use DISABLE_FIND_PACKAGE and such, maybe there is
some variable that'd work but well. It may make sense to just drop
Qt5 support in a future snapshot given 6 is the upstream preference.

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild | 3 +++
 games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild | 3 +++
 games-emulation/dolphin/dolphin-.ebuild | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
index 33218b7db9b5..6ff4a8dd29b9 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
@@ -129,6 +129,9 @@ src_prepare() {
 
# Remove dirty suffix: needed for netplay
sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die
+
+   # Force Qt5 rather than automagic until support is properly handled here
+   sed -i -e '/NAMES Qt6 COMP/d' Source/Core/DolphinQt/CMakeLists.txt || 
die
 }
 
 src_configure() {

diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
index abcdeec7c45b..5d4b0219d150 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
@@ -147,6 +147,9 @@ src_prepare() {
 
# Remove dirty suffix: needed for netplay
sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die
+
+   # Force Qt5 rather than automagic until support is properly handled here
+   sed -i -e '/NAMES Qt6 COMP/d' Source/Core/DolphinQt/CMakeLists.txt || 
die
 }
 
 src_configure() {

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index d888afe15b4d..ebe6fb575460 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -145,6 +145,9 @@ src_prepare() {
 
# Remove dirty suffix: needed for netplay
sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die
+
+   # Force Qt5 rather than automagic until support is properly handled here
+   sed -i -e '/NAMES Qt6 COMP/d' Source/Core/DolphinQt/CMakeLists.txt || 
die
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/, games-emulation/dolphin/files/

2022-07-10 Thread Sam James

commit: 65e79039b9cd3898cdb300f36357d5cc82c4f35c
Author: Christopher Rudolph  b-tu  de>
AuthorDate: Fri Jul  8 17:23:52 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 11 00:08:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65e79039

games-emulation/dolphin: fix build w/ libfmt-9

Apply patch to make games-emulation/dolphin-5.0_p20220520 build with
dev-libs/libfmt-9.

Signed-off-by: Christopher Rudolph  b-tu.de>
Signed-off-by: Sam James  gentoo.org>

 ...0520.ebuild => dolphin-5.0_p20220520-r1.ebuild} |  4 ++-
 ...phin-5.0_p20220520-libfmt-9.0.0-fix-build.patch | 32 ++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
similarity index 98%
rename from games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
rename to games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
index 381435640b8f..abcdeec7c45b 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520-r1.ebuild
@@ -35,12 +35,14 @@ IUSE="
profile pulseaudio systemd upnp vulkan
 "
 
+PATCHES=("${FILESDIR}/${P}-libfmt-9.0.0-fix-build.patch")
+
 RDEPEND="
app-arch/bzip2:=
app-arch/xz-utils:=
app-arch/zstd:=
dev-libs/hidapi:=
-   =dev-libs/libfmt-8*:=
+   >=dev-libs/libfmt-8:=
dev-libs/lzo:=
dev-libs/pugixml:=
media-libs/cubeb:=

diff --git 
a/games-emulation/dolphin/files/dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch
 
b/games-emulation/dolphin/files/dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch
new file mode 100644
index ..5bc2ae3877f4
--- /dev/null
+++ 
b/games-emulation/dolphin/files/dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch
@@ -0,0 +1,32 @@
+From: Christopher Rudolph
+Fix build with libfmt-9.0.0
+Upstream report: https://github.com/dolphin-emu/dolphin/pull/10825
+
+diff --git a/Source/Core/Common/MsgHandler.h b/Source/Core/Common/MsgHandler.h
+index 750da51..1d6a467 100644
+--- a/Source/Core/Common/MsgHandler.h
 b/Source/Core/Common/MsgHandler.h
+@@ -41,7 +41,11 @@ bool MsgAlertFmt(bool yes_no, MsgType style, 
Common::Log::LogType log_type, cons
+   static_assert(NumFields == sizeof...(args),
+ "Unexpected number of replacement fields in format string; 
did you pass too few or "
+ "too many arguments?");
++#if FMT_VERSION >= 9
++  static_assert(fmt::detail::is_compile_string::value);
++#else
+   static_assert(fmt::is_compile_string::value);
++#endif
+   return MsgAlertFmtImpl(yes_no, style, log_type, file, line, format,
+  fmt::make_format_args(args...));
+ }
+@@ -56,7 +60,11 @@ bool MsgAlertFmtT(bool yes_no, MsgType style, 
Common::Log::LogType log_type, con
+   static_assert(NumFields == sizeof...(args),
+ "Unexpected number of replacement fields in format string; 
did you pass too few or "
+ "too many arguments?");
++#if FMT_VERSION >= 9
++  static_assert(fmt::detail::is_compile_string::value);
++#else
+   static_assert(fmt::is_compile_string::value);
++#endif
+   auto arg_list = fmt::make_format_args(args...);
+   return MsgAlertFmtImpl(yes_no, style, log_type, file, line, 
translated_format, arg_list);
+ }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2022-07-07 Thread Ionen Wolkens

commit: eeb3124b9a3cfc2b297eead7b96cc15f60e08d88
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jul  7 08:18:28 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jul  7 08:30:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeb3124b

games-emulation/dolphin: pin snapshot to libfmt-8

Broken with 9 and needs >=8

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20220520.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
index d888afe15b4d..381435640b8f 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
app-arch/xz-utils:=
app-arch/zstd:=
dev-libs/hidapi:=
-   >=dev-libs/libfmt-8:=
+   =dev-libs/libfmt-8*:=
dev-libs/lzo:=
dev-libs/pugixml:=
media-libs/cubeb:=

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2022-06-22 Thread Arthur Zamarin

commit: 13ba09b3a205673812e51a6eb9ef6509a011983f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun 22 16:02:04 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun 22 16:02:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ba09b3

games-emulation/dolphin: Keyword 5.0_p20220520 arm64, #846533

Signed-off-by: Arthur Zamarin  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20220520.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
index d01848ded241..d888afe15b4d 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
@@ -22,7 +22,7 @@ else
)
"
S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~arm64"
 fi
 
 DESCRIPTION="Gamecube and Wii game emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2022-05-20 Thread Michał Górny

commit: bb0768f7aaa59b762014a303218eda57dce2ed1c
Author: Michał Górny  gentoo  org>
AuthorDate: Fri May 20 17:13:21 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri May 20 17:13:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0768f7

games-emulation/dolphin: Do not remove mgba in 

Thanks to xarblu for the suggestion.

Closes: https://bugs.gentoo.org/846578
Signed-off-by: Michał Górny  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20220520.ebuild | 2 +-
 games-emulation/dolphin/dolphin-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
index 582306b2f5a3..d01848ded241 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
@@ -117,7 +117,7 @@ declare -A KEEP_BUNDLED=(
 )
 
 src_prepare() {
-   if use mgba; then
+   if use mgba && [[ ${PV} != * ]]; then
rmdir Externals/mGBA/mgba || die
mv "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die
fi

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 69da69fee18f..d888afe15b4d 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -117,7 +117,7 @@ declare -A KEEP_BUNDLED=(
 )
 
 src_prepare() {
-   if use mgba; then
+   if use mgba && [[ ${PV} != * ]]; then
rmdir Externals/mGBA/mgba || die
mv "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die
fi

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2022-05-20 Thread Michał Górny

commit: 6e841bdd3281ab0359947e7d9fd156538417e1bb
Author: Michał Górny  gentoo  org>
AuthorDate: Fri May 20 06:39:44 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri May 20 06:41:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e841bdd

games-emulation/dolphin: Bump to 5.0_p20220520 snapshot

Closes: https://bugs.gentoo.org/845240
Signed-off-by: Michał Górny  gentoo.org>

 games-emulation/dolphin/Manifest   |   2 +
 ...in-.ebuild => dolphin-5.0_p20220520.ebuild} | 103 -
 games-emulation/dolphin/dolphin-.ebuild| 101 +++-
 3 files changed, 119 insertions(+), 87 deletions(-)

diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index ebcb62a46891..eaf5b6495ec4 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1 +1,3 @@
 DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B 
bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862
 SHA512 
5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f
+DIST dolphin-5.0_p20220520.tar.gz 34880474 BLAKE2B 
925cddfe8a5d6febced5721bea6ced7c8d2855619f74ca8940b95dc78ea523b4a1083b9ef6efe3561d833b8e9ecb742cb2adf5a1864c06b629b3ecd9e92cc871
 SHA512 
4993cb10061b142f6627c96493885a5f9d88857d8949c2e8e8d5df5ba6e19b4f98d199da5e641d3d61294884e1cbbe8191bc5b4445c60bf80723046b2524aad5
+DIST mgba-40d4c430fc36caeb7ea32fd39624947ed487d2f2.tar.gz 12921593 BLAKE2B 
8c5cf7b9b53f897f6248ad6bc51efafaa8a9d5df137d42d30f4b042b6d1527049644595938626c8cae1385d329bc45bf42db8dcc4424b963a3899e0df53246eb
 SHA512 
26d7b60cbc7415652bb9ca2a42ccd532856867db57bf6dd91d8204551970109b6b9f4a96c42d643ea96b9d071d6aec924d3c1bb79c251c95183b7fb8536456c9

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
similarity index 73%
copy from games-emulation/dolphin/dolphin-.ebuild
copy to games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
index c62f0305347a..582306b2f5a3 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,35 +11,47 @@ then
EGIT_SUBMODULES=( Externals/mGBA/mgba )
inherit git-r3
 else
-   EGIT_COMMIT=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68
+   EGIT_COMMIT=0f2540a0d1133950467845f20b1e003181147781
+   MGBA_COMMIT=40d4c430fc36caeb7ea32fd39624947ed487d2f2
SRC_URI="

https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz
-   -> ${P}.tar.gz"
+   -> ${P}.tar.gz
+   mgba? (
+   
https://github.com/mgba-emu/mgba/archive/${MGBA_COMMIT}.tar.gz
+   -> mgba-${MGBA_COMMIT}.tar.gz
+   )
+   "
S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-   KEYWORDS="~amd64 ~arm64"
+   KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Gamecube and Wii game emulator"
 HOMEPAGE="https://dolphin-emu.org/;
 
-LICENSE="GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 ZLIB"
+LICENSE="GPL-2+ BSD BSD-2 LGPL-2.1+ MIT ZLIB"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba
-   profile pulseaudio systemd upnp vulkan"
+IUSE="
+   alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba
+   profile pulseaudio systemd upnp vulkan
+"
 
 RDEPEND="
-   dev-libs/hidapi:0=
-   >=dev-libs/libfmt-7.1:0=
-   dev-libs/lzo:2=
-   dev-libs/pugixml:0=
-   media-libs/libpng:0=
+   app-arch/bzip2:=
+   app-arch/xz-utils:=
+   app-arch/zstd:=
+   dev-libs/hidapi:=
+   >=dev-libs/libfmt-8:=
+   dev-libs/lzo:=
+   dev-libs/pugixml:=
+   media-libs/cubeb:=
+   media-libs/libpng:=
media-libs/libsfml
media-libs/mesa[egl(+)]
net-libs/enet:1.3
-   net-libs/mbedtls:0=
-   net-misc/curl:0=
-   sys-libs/readline:0=
-   sys-libs/zlib:0=
+   net-libs/mbedtls:=
+   net-misc/curl:=
+   sys-libs/readline:=
+   sys-libs/zlib:=[minizip]
x11-libs/libXext
x11-libs/libXi
x11-libs/libXrandr
@@ -62,55 +74,54 @@ RDEPEND="
systemd? ( sys-apps/systemd:0= )
upnp? ( net-libs/miniupnpc )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+   ${RDEPEND}
+"
 BDEPEND="
sys-devel/gettext
-   virtual/pkgconfig"
+   virtual/pkgconfig
+"
 
 # vulkan-loader required for vulkan backend which can be selected
 # at runtime.
-RDEPEND="${RDEPEND}
-   vulkan? ( media-libs/vulkan-loader )"
+RDEPEND+="
+   vulkan? ( media-libs/vulkan-loader )
+"
 
 # [directory]=license
 declare -A KEEP_BUNDLED=(

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2022-04-27 Thread James Le Cuirot

commit: cb0810b6683c41e9f179c32f86844f4c7fbb9898
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Apr 27 22:09:55 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Apr 27 22:09:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0810b6

games-emulation/dolphin: Don't use variable in LICENSE

Closes: https://bugs.gentoo.org/840598
Signed-off-by: James Le Cuirot  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild | 4 +---
 games-emulation/dolphin/dolphin-.ebuild | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
index ec22c67307fc..33218b7db9b5 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
@@ -21,8 +21,7 @@ fi
 DESCRIPTION="Gamecube and Wii game emulator"
 HOMEPAGE="https://dolphin-emu.org/;
 
-# NB: appended below
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT ZLIB"
 SLOT="0"
 IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log
profile pulseaudio systemd upnp vulkan"
@@ -108,7 +107,6 @@ declare -A KEEP_BUNDLED=(
# No code to detect shared library.
[zstd]=BSD
 )
-LICENSE+=" ${KEEP_BUNDLED[*]}"
 
 src_prepare() {
cmake_src_prepare

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index a6b3ce256bbc..c62f0305347a 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -22,8 +22,7 @@ fi
 DESCRIPTION="Gamecube and Wii game emulator"
 HOMEPAGE="https://dolphin-emu.org/;
 
-# NB: appended below
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 ZLIB"
 SLOT="0"
 IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba
profile pulseaudio systemd upnp vulkan"
@@ -110,7 +109,6 @@ declare -A KEEP_BUNDLED=(
# This is a stripped-down mGBA for integrated GBA support
[mGBA]=MPL-2.0
 )
-LICENSE+=" ${KEEP_BUNDLED[*]}"
 
 src_prepare() {
cmake_src_prepare

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2022-01-08 Thread Michał Górny

commit: 653e1a4df707e927ce4862417fef4b626eeacb1c
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan  8 10:19:07 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan  8 10:27:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=653e1a4d

games-emulation/dolphin: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 .../dolphin/dolphin-5.0_p20210506-r2.ebuild| 197 -
 games-emulation/dolphin/metadata.xml   |   1 -
 2 files changed, 198 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r2.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r2.ebuild
deleted file mode 100644
index 1b20924f1037..
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro 
ru sr sv tr zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit cmake desktop xdg-utils pax-utils plocale
-
-if [[ ${PV} == * ]]
-then
-   EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin;
-   inherit git-r3
-else
-   inherit vcs-snapshot
-   commit=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68
-   
SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64"
-fi
-
-DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://www.dolphin-emu.org/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile 
pulseaudio +qt5 systemd upnp vulkan"
-
-RDEPEND="
-   dev-libs/hidapi:0=
-   >=dev-libs/libfmt-7.1:0=
-   dev-libs/lzo:2=
-   dev-libs/pugixml:0=
-   media-libs/libpng:0=
-   media-libs/libsfml
-   media-libs/mesa[egl(+)]
-   net-libs/enet:1.3
-   net-libs/mbedtls:0=
-   net-misc/curl:0=
-   sys-libs/readline:0=
-   sys-libs/zlib:0=
-   x11-libs/libXext
-   x11-libs/libXi
-   x11-libs/libXrandr
-   virtual/libusb:1
-   virtual/opengl
-   alsa? ( media-libs/alsa-lib )
-   bluetooth? ( net-wireless/bluez )
-   evdev? (
-   dev-libs/libevdev
-   virtual/udev
-   )
-   ffmpeg? ( media-video/ffmpeg:= )
-   profile? ( dev-util/oprofile )
-   pulseaudio? ( media-sound/pulseaudio )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   systemd? ( sys-apps/systemd:0= )
-   upnp? ( net-libs/miniupnpc )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig"
-
-# vulkan-loader required for vulkan backend which can be selected
-# at runtime.
-RDEPEND="${RDEPEND}
-   vulkan? ( media-libs/vulkan-loader )"
-
-PATCHES=("${FILESDIR}"/${P}-musl.patch)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # Remove all the bundled libraries that support system-installed
-   # preference. See CMakeLists.txt for conditional 'add_subdirectory' 
calls.
-   local KEEP_SOURCES=(
-   Bochs_disasm
-   FreeSurround
-
-   # vulkan's API is not backwards-compatible:
-   # new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR
-   # but dolphin still relies on it, bug #729832
-   Vulkan
-
-   cpp-optparse
-   # no support for for using system library
-   glslang
-   imgui
-
-   # not packaged, tiny header library
-   rangeset
-
-   # FIXME: xxhash can't be found by cmake
-   xxhash
-   # no support for for using system library
-   minizip
-   # soundtouch uses shorts, not floats
-   soundtouch
-   cubeb
-   discord-rpc
-   # Their build set up solely relies on the build in gtest.
-   gtest
-   # gentoo's version requires exception support.
-   # dolphin disables exceptions and fails the build.
-   picojson
-   # No code to detect shared library.
-   zstd
-   )
-   local s
-   for s in "${KEEP_SOURCES[@]}"; do
-   mv -v "Externals/${s}" . || die
-   done
-   einfo "removing sources: $(echo Externals/*)"
-   rm -r Externals/* || die "Failed to delete Externals dir."
-   for s in "${KEEP_SOURCES[@]}"; do
-   mv -v "${s}" "Externals/" || die
-   done
-
-   remove_locale() {
-   # Ensure preservation of the backup locale when no valid LINGUA 
is set
-   if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ 
"${PLOCALE_BACKUP}" == "$(plocale_get_locales)" ]]; then
-   return
-   else
-   rm "Languages/po/${1}.po" || die
-

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2022-01-08 Thread Michał Górny

commit: 3564dc9d16fc72c6397c734b59016f1fcda4beb7
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jan  8 10:26:39 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jan  8 10:27:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3564dc9d

games-emulation/dolphin: Restrict libfmt due to build failure

Signed-off-by: Michał Górny  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
index 715fe05c7d11..ec22c67307fc 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui 
log
 
 RDEPEND="
dev-libs/hidapi:0=
-   >=dev-libs/libfmt-7.1:0=
+

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-10-30 Thread Sam James

commit: 698e9b96a465b95ef8fbca0a6bc190925129c962
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Jul 22 05:37:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 31 00:19:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=698e9b96

games-emulation/dolphin: Set USE-defaults for mesa[egl,gbm]

Signed-off-by: Matt Turner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 .../{dolphin-5.0_p20210506.ebuild => dolphin-5.0_p20210506-r2.ebuild}   | 2 +-
 ...{dolphin-5.0_p20210506-r1.ebuild => dolphin-5.0_p20210506-r3.ebuild} | 2 +-
 games-emulation/dolphin/dolphin-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r2.ebuild
similarity index 99%
rename from games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
rename to games-emulation/dolphin/dolphin-5.0_p20210506-r2.ebuild
index 5a9c3f73925..1b20924f103 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
dev-libs/pugixml:0=
media-libs/libpng:0=
media-libs/libsfml
-   media-libs/mesa[egl]
+   media-libs/mesa[egl(+)]
net-libs/enet:1.3
net-libs/mbedtls:0=
net-misc/curl:0=

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
similarity index 99%
rename from games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
rename to games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
index e487f7c878e..715fe05c7d1 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
dev-libs/pugixml:0=
media-libs/libpng:0=
media-libs/libsfml
-   media-libs/mesa[egl]
+   media-libs/mesa[egl(+)]
net-libs/enet:1.3
net-libs/mbedtls:0=
net-misc/curl:0=

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 3da7b2e3d4f..a6b3ce256bb 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
dev-libs/pugixml:0=
media-libs/libpng:0=
media-libs/libsfml
-   media-libs/mesa[egl]
+   media-libs/mesa[egl(+)]
net-libs/enet:1.3
net-libs/mbedtls:0=
net-misc/curl:0=

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-09-27 Thread Agostino Sarubbo

commit: 90b20db1a58de6f67c01006909ec46ba5b1a1295
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Sep 27 06:53:58 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Sep 27 06:53:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90b20db1

games-emulation/dolphin: amd64 stable wrt bug #815028

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
index ff1c6123f87..e487f7c878e 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
@@ -15,7 +15,7 @@ else

https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz
-> ${P}.tar.gz"
S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-   KEYWORDS="~amd64 ~arm64"
+   KEYWORDS="amd64 ~arm64"
 fi
 
 DESCRIPTION="Gamecube and Wii game emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-08-08 Thread Michał Górny

commit: b1a7d2251f1ce089d554d2872c5f3570879527e2
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug  8 09:38:23 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  8 09:54:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a7d225

games-emulation/dolphin: Fix LICENSE

Adjust the package's license to GPL-2+, plus add licenses for
the bundled deps.

Signed-off-by: Michał Górny  gentoo.org>

 .../dolphin/dolphin-5.0_p20210506-r1.ebuild| 76 ++--
 games-emulation/dolphin/dolphin-.ebuild| 82 +++---
 2 files changed, 81 insertions(+), 77 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
index 28d9f08814f..994989ac1a8 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
@@ -21,7 +21,8 @@ fi
 DESCRIPTION="Gamecube and Wii game emulator"
 HOMEPAGE="https://dolphin-emu.org/;
 
-LICENSE="GPL-2"
+# NB: appended below
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log
profile pulseaudio systemd upnp vulkan"
@@ -73,48 +74,49 @@ RDEPEND="${RDEPEND}
 
 PATCHES=("${FILESDIR}"/${P}-musl.patch)
 
+# [directory]=license
+declare -A KEEP_BUNDLED=(
+   [Bochs_disasm]=LGPL-2.1+
+   [FreeSurround]=GPL-2+
+
+   # vulkan's API is not backwards-compatible:
+   # new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR
+   # but dolphin still relies on it, bug #729832
+   [Vulkan]=Apache-2.0
+
+   [cpp-optparse]=MIT
+   # no support for for using system library
+   [glslang]=BSD
+   [imgui]=MIT
+
+   # not packaged, tiny header library
+   [rangeset]=ZLIB
+
+   # FIXME: xxhash can't be found by cmake
+   [xxhash]=BSD-2
+   # no support for for using system library
+   [minizip]=ZLIB
+   # soundtouch uses shorts, not floats
+   [soundtouch]=LGPL-2.1+
+   [cubeb]=ISC
+   [discord-rpc]=MIT
+   # Their build set up solely relies on the build in gtest.
+   [gtest]= # (build-time only)
+   # gentoo's version requires exception support.
+   # dolphin disables exceptions and fails the build.
+   [picojson]=BSD-2
+   # No code to detect shared library.
+   [zstd]=BSD
+)
+LICENSE+=" ${KEEP_BUNDLED[*]}"
+
 src_prepare() {
cmake_src_prepare
 
-   # Remove all the bundled libraries that support system-installed
-   # preference. See CMakeLists.txt for conditional 'add_subdirectory' 
calls.
-   local keep_sources=(
-   Bochs_disasm
-   FreeSurround
-
-   # vulkan's API is not backwards-compatible:
-   # new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR
-   # but dolphin still relies on it, bug #729832
-   Vulkan
-
-   cpp-optparse
-   # no support for for using system library
-   glslang
-   imgui
-
-   # not packaged, tiny header library
-   rangeset
-
-   # FIXME: xxhash can't be found by cmake
-   xxhash
-   # no support for for using system library
-   minizip
-   # soundtouch uses shorts, not floats
-   soundtouch
-   cubeb
-   discord-rpc
-   # Their build set up solely relies on the build in gtest.
-   gtest
-   # gentoo's version requires exception support.
-   # dolphin disables exceptions and fails the build.
-   picojson
-   # No code to detect shared library.
-   zstd
-   )
local s remove=()
for s in Externals/*; do
[[ -f ${s} ]] && continue
-   if ! has "${s#Externals/}" "${keep_sources[@]}"; then
+   if ! has "${s#Externals/}" "${!KEEP_BUNDLED[@]}"; then
remove+=( "${s}" )
fi
done

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index cc0e8a05e21..1a7a4c37e4e 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -22,7 +22,8 @@ fi
 DESCRIPTION="Gamecube and Wii game emulator"
 HOMEPAGE="https://dolphin-emu.org/;
 
-LICENSE="GPL-2"
+# NB: appended below
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba
profile pulseaudio systemd upnp vulkan"
@@ -72,51 +73,52 @@ BDEPEND="
 RDEPEND="${RDEPEND}
vulkan? ( media-libs/vulkan-loader )"
 
+# [directory]=license
+declare -A KEEP_BUNDLED=(
+   [Bochs_disasm]=LGPL-2.1+
+   [FreeSurround]=GPL-2+
+
+   # vulkan's API is not backwards-compatible:
+   # new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR
+   # but dolphin still relies

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-08-08 Thread Michał Górny

commit: 91d85792928a03279488837936da49a6cc44d682
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug  8 08:54:42 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  8 09:54:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91d85792

games-emulation/dolphin: Remove USE=lto

Signed-off-by: Michał Górny  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild | 5 +++--
 games-emulation/dolphin/dolphin-.ebuild | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
index 009f64178fa..197f1a4d086 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log
profile pulseaudio +qt5 systemd upnp vulkan"
 
 RDEPEND="
@@ -141,7 +141,8 @@ src_configure() {
-DENABLE_EVDEV=$(usex evdev)
-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
-DENABLE_LLVM=OFF
-   -DENABLE_LTO=$(usex lto)
+   # just adds -flto, user can do that via flags
+   -DENABLE_LTO=OFF
-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-DENABLE_QT=$(usex qt5)
-DENABLE_SDL=OFF # not supported: #666558

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 28cc6679d93..07bcced944c 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto mgba
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log mgba
profile pulseaudio +qt5 systemd upnp vulkan"
 
 RDEPEND="
@@ -143,7 +143,8 @@ src_configure() {
-DENABLE_EVDEV=$(usex evdev)
-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
-DENABLE_LLVM=OFF
-   -DENABLE_LTO=$(usex lto)
+   # just adds -flto, user can do that via flags
+   -DENABLE_LTO=OFF
-DUSE_MGBA=$(usex mgba)
-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-DENABLE_QT=$(usex qt5)

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-08-08 Thread Michał Górny

commit: 13d9af8c9c6fceff9ee2a5baaf5951e4f9d9a634
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug  8 09:52:53 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  8 09:54:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13d9af8c

games-emulation/dolphin: Fix running tests

Signed-off-by: Michał Górny  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild | 4 
 games-emulation/dolphin/dolphin-.ebuild | 4 
 2 files changed, 8 insertions(+)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
index 994989ac1a8..ff1c6123f87 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
@@ -167,6 +167,10 @@ src_configure() {
cmake_src_configure
 }
 
+src_test() {
+   cmake_build unittests
+}
+
 src_install() {
cmake_src_install
 

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 1a7a4c37e4e..3da7b2e3d4f 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -170,6 +170,10 @@ src_configure() {
cmake_src_configure
 }
 
+src_test() {
+   cmake_build unittests
+}
+
 src_install() {
cmake_src_install

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-08-08 Thread Michał Górny

commit: c555dea2868f595dd9262d22a85c0323397406bb
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug  8 08:58:40 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  8 09:54:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c555dea2

games-emulation/dolphin: USE={qt5 → gui}

The Qt5 GUI is the only supported GUI in the ebuild, so use the generic
flag for it.

Signed-off-by: Michał Górny  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild | 12 ++--
 games-emulation/dolphin/dolphin-.ebuild | 12 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
index 197f1a4d086..c85cb41f419 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
@@ -23,8 +23,8 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log
-   profile pulseaudio +qt5 systemd upnp vulkan"
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log
+   profile pulseaudio systemd upnp vulkan"
 
 RDEPEND="
dev-libs/hidapi:0=
@@ -51,13 +51,13 @@ RDEPEND="
virtual/udev
)
ffmpeg? ( media-video/ffmpeg:= )
-   profile? ( dev-util/oprofile )
-   pulseaudio? ( media-sound/pulseaudio )
-   qt5? (
+   gui? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)
+   profile? ( dev-util/oprofile )
+   pulseaudio? ( media-sound/pulseaudio )
systemd? ( sys-apps/systemd:0= )
upnp? ( net-libs/miniupnpc )
 "
@@ -144,7 +144,7 @@ src_configure() {
# just adds -flto, user can do that via flags
-DENABLE_LTO=OFF
-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-   -DENABLE_QT=$(usex qt5)
+   -DENABLE_QT=$(usex gui)
-DENABLE_SDL=OFF # not supported: #666558
-DENABLE_VULKAN=$(usex vulkan)
-DFASTLOG=$(usex log)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 07bcced944c..7842f809ac1 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -24,8 +24,8 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log mgba
-   profile pulseaudio +qt5 systemd upnp vulkan"
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log mgba
+   profile pulseaudio systemd upnp vulkan"
 
 RDEPEND="
dev-libs/hidapi:0=
@@ -52,13 +52,13 @@ RDEPEND="
virtual/udev
)
ffmpeg? ( media-video/ffmpeg:= )
-   profile? ( dev-util/oprofile )
-   pulseaudio? ( media-sound/pulseaudio )
-   qt5? (
+   gui? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)
+   profile? ( dev-util/oprofile )
+   pulseaudio? ( media-sound/pulseaudio )
systemd? ( sys-apps/systemd:0= )
upnp? ( net-libs/miniupnpc )
 "
@@ -147,7 +147,7 @@ src_configure() {
-DENABLE_LTO=OFF
-DUSE_MGBA=$(usex mgba)
-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-   -DENABLE_QT=$(usex qt5)
+   -DENABLE_QT=$(usex gui)
-DENABLE_SDL=OFF # not supported: #666558
-DENABLE_VULKAN=$(usex vulkan)
-DFASTLOG=$(usex log)

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-08-08 Thread Michał Górny

commit: ca76a7635f4d53cc8efc5b2a0d17594be462a4f9
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug  8 08:59:15 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  8 09:54:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca76a763

games-emulation/dolphin: Update HOMEPAGE

Signed-off-by: Michał Górny  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild | 2 +-
 games-emulation/dolphin/dolphin-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
index c85cb41f419..28d9f08814f 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
@@ -19,7 +19,7 @@ else
 fi
 
 DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://www.dolphin-emu.org/;
+HOMEPAGE="https://dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 7842f809ac1..cc0e8a05e21 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -20,7 +20,7 @@ else
 fi
 
 DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://www.dolphin-emu.org/;
+HOMEPAGE="https://dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-08-08 Thread Michał Górny

commit: b73bfddaea9607d05525bb371a7f953b2165e981
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug  8 08:44:10 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  8 09:54:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b73bfdda

games-emulation/dolphin: Remove vcs-snapshot.eclass

Signed-off-by: Michał Górny  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild | 6 +++---
 games-emulation/dolphin/dolphin-.ebuild | 8 
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
index ac9393e5df3..3cf993b7b21 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
@@ -10,9 +10,9 @@ then
EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin;
inherit git-r3
 else
-   inherit vcs-snapshot
-   commit=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68
-   
SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> 
${P}.tar.gz"
+   EGIT_COMMIT=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68
+   
SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz 
-> ${P}.tar.gz"
+   S=${WORKDIR}/${PN}-${EGIT_COMMIT}
KEYWORDS="~amd64 ~arm64"
 fi
 

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 29779609bc0..1fc6ba66f6b 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -11,10 +11,10 @@ then
EGIT_SUBMODULES=( Externals/mGBA/mgba )
inherit git-r3
 else
-   inherit vcs-snapshot
-   commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b
-   
SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64"
+   EGIT_COMMIT=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68
+   
SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz 
-> ${P}.tar.gz"
+   S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+   KEYWORDS="~amd64 ~arm64"
 fi
 
 DESCRIPTION="Gamecube and Wii game emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-08-08 Thread Michał Górny

commit: 7010cb3306f0fb2e63fd1f52d256ada4c9cfb9e6
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug  8 08:51:17 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  8 09:54:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7010cb33

games-emulation/dolphin: Make bundled dep removal less reverse

Signed-off-by: Michał Górny  gentoo.org>

 .../dolphin/dolphin-5.0_p20210506-r1.ebuild   | 19 ++-
 games-emulation/dolphin/dolphin-.ebuild   | 17 +
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
index 83548704203..009f64178fa 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
@@ -78,7 +78,7 @@ src_prepare() {
 
# Remove all the bundled libraries that support system-installed
# preference. See CMakeLists.txt for conditional 'add_subdirectory' 
calls.
-   local KEEP_SOURCES=(
+   local keep_sources=(
Bochs_disasm
FreeSurround
 
@@ -111,16 +111,17 @@ src_prepare() {
# No code to detect shared library.
zstd
)
-   local s
-   for s in "${KEEP_SOURCES[@]}"; do
-   mv -v "Externals/${s}" . || die
-   done
-   einfo "removing sources: $(echo Externals/*)"
-   rm -r Externals/* || die "Failed to delete Externals dir."
-   for s in "${KEEP_SOURCES[@]}"; do
-   mv -v "${s}" "Externals/" || die
+   local s remove=()
+   for s in Externals/*; do
+   [[ -f ${s} ]] && continue
+   if ! has "${s#Externals/}" "${keep_sources[@]}"; then
+   remove+=( "${s}" )
+   fi
done
 
+   einfo "removing sources: ${remove[*]}"
+   rm -r "${remove[@]}" || die
+
# About 50% compile-time speedup
if ! use vulkan; then
sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index c37e6af106c..28cc6679d93 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -113,16 +113,17 @@ src_prepare() {
# This is a stripped-down mGBA for integrated GBA support
mGBA
)
-   local s
-   for s in "${KEEP_SOURCES[@]}"; do
-   mv -v "Externals/${s}" . || die
-   done
-   einfo "removing sources: $(echo Externals/*)"
-   rm -r Externals/* || die "Failed to delete Externals dir."
-   for s in "${KEEP_SOURCES[@]}"; do
-   mv -v "${s}" "Externals/" || die
+   local s remove=()
+   for s in Externals/*; do
+   [[ -f ${s} ]] && continue
+   if ! has "${s#Externals/}" "${keep_sources[@]}"; then
+   remove+=( "${s}" )
+   fi
done
 
+   einfo "removing sources: ${remove[*]}"
+   rm -r "${remove[@]}" || die
+
# About 50% compile-time speedup
if ! use vulkan; then
sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-08-08 Thread Michał Górny

commit: 5dfbd7110e7333f57a7b839df4c1c51ac261ad25
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug  8 08:42:43 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  8 09:54:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dfbd711

games-emulation/dolphin: Add missing ||die

Signed-off-by: Michał Górny  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild | 6 --
 games-emulation/dolphin/dolphin-.ebuild | 6 --
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
index 8b084ec1f69..ac9393e5df3 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
@@ -119,10 +119,12 @@ src_prepare() {
done
 
# About 50% compile-time speedup
-   use vulkan || sed -i -e '/Externals\/glslang/d' CMakeLists.txt
+   if ! use vulkan; then
+   sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die
+   fi
 
# Remove dirty suffix: needed for netplay
-   sed -i -e 's/--dirty/&=""/' CMakeLists.txt
+   sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die
 }
 
 src_configure() {

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index c46031141fb..29779609bc0 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -121,10 +121,12 @@ src_prepare() {
done
 
# About 50% compile-time speedup
-   use vulkan || sed -i -e '/Externals\/glslang/d' CMakeLists.txt
+   if ! use vulkan; then
+   sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die
+   fi
 
# Remove dirty suffix: needed for netplay
-   sed -i -e 's/--dirty/&=""/' CMakeLists.txt
+   sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-08-08 Thread Michał Górny

commit: 9eb5f1176b8f5476b8e2f699cf7f01f47512f29e
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug  8 08:45:12 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  8 09:54:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eb5f117

games-emulation/dolphin: Wrap long lines in ebuild

Signed-off-by: Michał Górny  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild | 7 +--
 games-emulation/dolphin/dolphin-.ebuild | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
index 3cf993b7b21..83548704203 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
@@ -11,7 +11,9 @@ then
inherit git-r3
 else
EGIT_COMMIT=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68
-   
SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz 
-> ${P}.tar.gz"
+   SRC_URI="
+   
https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz
+   -> ${P}.tar.gz"
S=${WORKDIR}/${PN}-${EGIT_COMMIT}
KEYWORDS="~amd64 ~arm64"
 fi
@@ -21,7 +23,8 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile 
pulseaudio +qt5 systemd upnp vulkan"
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto
+   profile pulseaudio +qt5 systemd upnp vulkan"
 
 RDEPEND="
dev-libs/hidapi:0=

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 1fc6ba66f6b..c37e6af106c 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -12,7 +12,9 @@ then
inherit git-r3
 else
EGIT_COMMIT=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68
-   
SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz 
-> ${P}.tar.gz"
+   SRC_URI="
+   
https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz
+   -> ${P}.tar.gz"
S=${WORKDIR}/${PN}-${EGIT_COMMIT}
KEYWORDS="~amd64 ~arm64"
 fi
@@ -22,7 +24,8 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto mgba profile 
pulseaudio +qt5 systemd upnp vulkan"
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto mgba
+   profile pulseaudio +qt5 systemd upnp vulkan"
 
 RDEPEND="
dev-libs/hidapi:0=

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-08-08 Thread Michał Górny

commit: b5ae99c38720cbb62931eb630a10621ab345f1e1
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug  8 08:40:41 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug  8 09:54:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5ae99c3

games-emulation/dolphin: Remove use of plocale.eclass

Remove plocale.eclass usage.  The tiny .mo files are not worth the added
complexity.

Signed-off-by: Michał Górny  gentoo.org>

 ....ebuild => dolphin-5.0_p20210506-r1.ebuild} | 30 +-
 games-emulation/dolphin/dolphin-.ebuild| 17 +---
 2 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
similarity index 84%
copy from games-emulation/dolphin/dolphin-.ebuild
copy to games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
index 891daca38b3..8b084ec1f69 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506-r1.ebuild
@@ -3,21 +3,17 @@
 
 EAPI=7
 
-PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro 
ru sr sv tr zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit cmake desktop xdg-utils pax-utils plocale
+inherit cmake desktop xdg-utils pax-utils
 
 if [[ ${PV} == * ]]
 then
EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin;
-   EGIT_SUBMODULES=( Externals/mGBA/mgba )
inherit git-r3
 else
inherit vcs-snapshot
-   commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b
+   commit=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68

SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~arm64"
 fi
 
 DESCRIPTION="Gamecube and Wii game emulator"
@@ -25,7 +21,7 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto mgba profile 
pulseaudio +qt5 systemd upnp vulkan"
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile 
pulseaudio +qt5 systemd upnp vulkan"
 
 RDEPEND="
dev-libs/hidapi:0=
@@ -72,6 +68,8 @@ BDEPEND="
 RDEPEND="${RDEPEND}
vulkan? ( media-libs/vulkan-loader )"
 
+PATCHES=("${FILESDIR}"/${P}-musl.patch)
+
 src_prepare() {
cmake_src_prepare
 
@@ -109,9 +107,6 @@ src_prepare() {
picojson
# No code to detect shared library.
zstd
-
-   # This is a stripped-down mGBA for integrated GBA support
-   mGBA
)
local s
for s in "${KEEP_SOURCES[@]}"; do
@@ -123,18 +118,6 @@ src_prepare() {
mv -v "${s}" "Externals/" || die
done
 
-   remove_locale() {
-   # Ensure preservation of the backup locale when no valid LINGUA 
is set
-   if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ 
"${PLOCALE_BACKUP}" == "$(plocale_get_locales)" ]]; then
-   return
-   else
-   rm "Languages/po/${1}.po" || die
-   fi
-   }
-
-   plocale_find_changes "Languages/po/" "" '.po'
-   plocale_for_each_disabled_locale remove_locale
-
# About 50% compile-time speedup
use vulkan || sed -i -e '/Externals\/glslang/d' CMakeLists.txt
 
@@ -153,7 +136,6 @@ src_configure() {
-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
-DENABLE_LLVM=OFF
-DENABLE_LTO=$(usex lto)
-   -DUSE_MGBA=$(usex mgba)
-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-DENABLE_QT=$(usex qt5)
-DENABLE_SDL=OFF # not supported: #666558

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 891daca38b3..c46031141fb 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -3,10 +3,7 @@
 
 EAPI=7
 
-PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro 
ru sr sv tr zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit cmake desktop xdg-utils pax-utils plocale
+inherit cmake desktop xdg-utils pax-utils
 
 if [[ ${PV} == * ]]
 then
@@ -123,18 +120,6 @@ src_prepare() {
mv -v "${s}" "Externals/" || die
done
 
-   remove_locale() {
-   # Ensure preservation of the backup locale when no valid LINGUA 
is set
-   if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ 
"${PLOCALE_BACKUP}" == "$(plocale_get_locales)" ]]; then
-   return
-   else
-   rm "Languages/po/${1}.po" || die
-   fi
-   }
-
-   plocale_find_changes "Languages/po/" "" '.po'
-   plocale_for_each_disabled_locale remove_locale
-
# About 50% compile-time speedup
use vulkan || sed -i -e '/Externals\/glslang/d' CMakeLists.txt

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-08-05 Thread Michał Górny

commit: baffc25f0a3823bd70b0d5f8e7c6f8e66b721243
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Aug  6 01:58:23 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Aug  6 01:58:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baffc25f

games-emulation/dolphin: Add myself as maintainer

Signed-off-by: Michał Górny  gentoo.org>

 games-emulation/dolphin/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/games-emulation/dolphin/metadata.xml 
b/games-emulation/dolphin/metadata.xml
index 9e41d2d2f00..11a98aff754 100644
--- a/games-emulation/dolphin/metadata.xml
+++ b/games-emulation/dolphin/metadata.xml
@@ -1,6 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   mgo...@gentoo.org
+   Michał Górny
+   

ga...@gentoo.org
Gentoo Games Project

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-08-05 Thread Ionen Wolkens

commit: e832833702ad019569199df96a61277a23fcaff9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug  5 22:51:59 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug  5 22:52:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8328337

games-emulation/dolphin: adopt for games@

Signed-off-by: Ionen Wolkens  gentoo.org>

 games-emulation/dolphin/metadata.xml | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/games-emulation/dolphin/metadata.xml 
b/games-emulation/dolphin/metadata.xml
index 202c22bfe00..9e41d2d2f00 100644
--- a/games-emulation/dolphin/metadata.xml
+++ b/games-emulation/dolphin/metadata.xml
@@ -1,7 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   ga...@gentoo.org
+   Gentoo Games Project
+   

Enables Discord Rich Presence, 
show the current game on Discord
Enable evdev input support
@@ -11,8 +14,8 @@
Enable support for Vulkan-based video 
backend.


-Dolphin is a Gamecube and Wii emulator. Most games run perfectly or with minor
-bugs. Games are playable at HD quality, with 1080p and more.
+   Dolphin is a Gamecube and Wii emulator. Most games run 
perfectly or with
+   minor bugs. Games are playable at HD quality, with 1080p and 
more.


dolphin-emu/dolphin

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-08-04 Thread Sergei Trofimovich

commit: 3712a3b299da8708b128a912685d33b31fc3b74b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Aug  4 08:53:17 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Aug  4 09:01:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3712a3b2

games-emulation/dolphin: drop slyfox@ from maintainers down to m-n

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/metadata.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/games-emulation/dolphin/metadata.xml 
b/games-emulation/dolphin/metadata.xml
index 73d4bba4f2b..202c22bfe00 100644
--- a/games-emulation/dolphin/metadata.xml
+++ b/games-emulation/dolphin/metadata.xml
@@ -1,9 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   sly...@gentoo.org
-   
+   

Enables Discord Rich Presence, 
show the current game on Discord
Enable evdev input support

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-07-30 Thread Sergei Trofimovich

commit: 98c49b79ffe0df4b62d0d96fde03c7e9c439079f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Jul 29 22:54:43 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jul 30 07:49:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98c49b79

games-emulation/dolphin: add IUSE=mgba

Fix-by: xarblu  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21829
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 3 ++-
 games-emulation/dolphin/metadata.xml| 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index fd99d406616..891daca38b3 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile 
pulseaudio +qt5 systemd upnp vulkan"
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto mgba profile 
pulseaudio +qt5 systemd upnp vulkan"
 
 RDEPEND="
dev-libs/hidapi:0=
@@ -153,6 +153,7 @@ src_configure() {
-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
-DENABLE_LLVM=OFF
-DENABLE_LTO=$(usex lto)
+   -DUSE_MGBA=$(usex mgba)
-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-DENABLE_QT=$(usex qt5)
-DENABLE_SDL=OFF # not supported: #666558

diff --git a/games-emulation/dolphin/metadata.xml 
b/games-emulation/dolphin/metadata.xml
index 965b67caf1e..73d4bba4f2b 100644
--- a/games-emulation/dolphin/metadata.xml
+++ b/games-emulation/dolphin/metadata.xml
@@ -9,6 +9,7 @@
Enable evdev input support
Increase logging output
Add support for link-time optimizations.
+   Enables GBA controllers emulation using 
libmgba.
Enable support for Vulkan-based video 
backend.

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-07-28 Thread Sergei Trofimovich

commit: ec76e3439fd84be67bcd5b1e6591ccd24253b0d2
Author: Taylor C. Richberger  gmx  com>
AuthorDate: Wed Jul 28 03:25:08 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Jul 28 06:45:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec76e343

games-emulation/dolphin: enable mGBA support

Closes: https://bugs.gentoo.org/804666
Reported-by: Taylor C. Richberger  gmx.com>
Reviewed-by: Sergei Trofimovich  gentoo.org>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index b2fd4d44554..fd99d406616 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -11,7 +11,7 @@ inherit cmake desktop xdg-utils pax-utils plocale
 if [[ ${PV} == * ]]
 then
EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin;
-   EGIT_SUBMODULES=()
+   EGIT_SUBMODULES=( Externals/mGBA/mgba )
inherit git-r3
 else
inherit vcs-snapshot
@@ -109,6 +109,9 @@ src_prepare() {
picojson
# No code to detect shared library.
zstd
+
+   # This is a stripped-down mGBA for integrated GBA support
+   mGBA
)
local s
for s in "${KEEP_SOURCES[@]}"; do

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/, games-emulation/dolphin/files/

2021-07-02 Thread Sergei Trofimovich

commit: e7e66a46b94f8707499ab2c266b3a6ce627cadc5
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Jul  2 06:42:59 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jul  2 06:43:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e66a46

games-emulation/dolphin: add missing headers for musl

Reported-by: ernsteiswuerfel
Closes: https://bugs.gentoo.org/799281
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../dolphin/dolphin-5.0_p20210506.ebuild   |  2 ++
 .../dolphin/files/dolphin-5.0_p20210506-musl.patch | 24 ++
 2 files changed, 26 insertions(+)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
index 2a9debffb0f..fd44c78fa9e 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
@@ -71,6 +71,8 @@ BDEPEND="
 RDEPEND="${RDEPEND}
vulkan? ( media-libs/vulkan-loader )"
 
+PATCHES=("${FILESDIR}"/${P}-musl.patch)
+
 src_prepare() {
cmake_src_prepare
 

diff --git a/games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch 
b/games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch
new file mode 100644
index 000..51570151c11
--- /dev/null
+++ b/games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/799281
+https://github.com/dolphin-emu/dolphin/commit/7a1922fd8f0f6686188d179732c9757faf2d1b4f.patch
+
+From 7a1922fd8f0f6686188d179732c9757faf2d1b4f Mon Sep 17 00:00:00 2001
+From: thyrc 
+Date: Mon, 14 Jun 2021 10:18:34 +0200
+Subject: [PATCH] Fix includes for musl libc
+
+---
+ Source/Core/Core/MemoryWatcher.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/Core/Core/MemoryWatcher.cpp 
b/Source/Core/Core/MemoryWatcher.cpp
+index 491ecd83150a..13843e2021ca 100644
+--- a/Source/Core/Core/MemoryWatcher.cpp
 b/Source/Core/Core/MemoryWatcher.cpp
+@@ -2,6 +2,7 @@
+ // Licensed under GPLv2+
+ // Refer to the license.txt file included.
+ 
++#include 
+ #include 
+ #include 
+ #include

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-06-19 Thread Sergei Trofimovich

commit: 51399240283009f0a070d44f56e16922be961ea5
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun 19 08:58:48 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun 19 09:01:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51399240

games-emulation/dolphin: drop old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/Manifest   |   1 -
 .../dolphin/dolphin-5.0_p20200705.ebuild   | 181 -
 2 files changed, 182 deletions(-)

diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index a41a30fcaaf..ebcb62a4689 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,2 +1 @@
-DIST dolphin-5.0_p20200705.tar.gz 41580877 BLAKE2B 
78fce8cb10543857633d6678b0ebb8f195e10652b9316f3346d5c84797dea96a31f509f86cb9470b4b9677ca58c4a865494121277cd0bc7dcc93932da9f4
 SHA512 
8b1aed8c98ff7205d7b1716aea3faad0bfa3d1ff3fe3a616431a421ae62592a57887e18295276b7a0fee52d19e641b72d5dc00e071cefea7fbe40adc9f3f01a1
 DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B 
bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862
 SHA512 
5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f

diff --git a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
deleted file mode 100644
index d06511da1c5..000
--- a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro 
ru sr sv tr zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit cmake desktop xdg-utils l10n pax-utils
-
-if [[ ${PV} == * ]]
-then
-   EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin;
-   inherit git-r3
-else
-   inherit vcs-snapshot
-   commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b
-   
SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64"
-fi
-
-DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://www.dolphin-emu.org/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile 
pulseaudio +qt5 systemd upnp"
-
-RDEPEND="
-   dev-libs/hidapi:0=
-   dev-libs/libfmt:0=
-   dev-libs/lzo:2=
-   dev-libs/pugixml:0=
-   media-libs/libpng:0=
-   media-libs/libsfml
-   media-libs/mesa[egl]
-   net-libs/enet:1.3
-   net-libs/mbedtls:0=
-   net-misc/curl:0=
-   sys-libs/readline:0=
-   sys-libs/zlib:0=
-   x11-libs/libXext
-   x11-libs/libXi
-   x11-libs/libXrandr
-   virtual/libusb:1
-   virtual/opengl
-   alsa? ( media-libs/alsa-lib )
-   bluetooth? ( net-wireless/bluez )
-   evdev? (
-   dev-libs/libevdev
-   virtual/udev
-   )
-   ffmpeg? ( media-video/ffmpeg:= )
-   profile? ( dev-util/oprofile )
-   pulseaudio? ( media-sound/pulseaudio )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   systemd? ( sys-apps/systemd:0= )
-   upnp? ( net-libs/miniupnpc )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig"
-
-# vulkan-loader required for vulkan backend which can be selected
-# at runtime.
-RDEPEND="${RDEPEND}
-   media-libs/vulkan-loader"
-
-src_prepare() {
-   cmake_src_prepare
-
-   # Remove all the bundled libraries that support system-installed
-   # preference. See CMakeLists.txt for conditional 'add_subdirectory' 
calls.
-   local KEEP_SOURCES=(
-   Bochs_disasm
-   FreeSurround
-
-   # vulkan's API is not backwards-compatible:
-   # new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR
-   # but dolphin still relies on it, bug #729832
-   Vulkan
-
-   cpp-optparse
-   # no support for for using system library
-   glslang
-   imgui
-   # FIXME: xxhash can't be found by cmake
-   xxhash
-   # no support for for using system library
-   minizip
-   # soundtouch uses shorts, not floats
-   soundtouch
-   cubeb
-   discord-rpc
-   # Their build set up solely relies on the build in gtest.
-   gtest
-   # gentoo's version requires exception support.
-   # dolphin disables exceptions and fails the build.
-   picojson
-   # No code to detect

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-06-13 Thread Agostino Sarubbo

commit: 0bbbf2c1fddc383d6fa8957be4f188acf2089033
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 13 06:27:47 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 13 06:27:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bbbf2c1

games-emulation/dolphin: amd64 stable wrt bug #795552

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20210506.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
index 9ca2ed316a3..2a9debffb0f 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
@@ -16,7 +16,7 @@ else
inherit vcs-snapshot
commit=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68

SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64"
+   KEYWORDS="amd64 ~arm64"
 fi
 
 DESCRIPTION="Gamecube and Wii game emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-05-12 Thread Sergei Trofimovich

commit: 48f3056164988e3c6ead28cd9135b4b035921ebb
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed May 12 20:14:17 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed May 12 20:14:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48f30561

games-emulation/dolphin: bump up to 5.0_p20210506

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/789609
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/Manifest   |   1 +
 .../dolphin/dolphin-5.0_p20210506.ebuild   | 195 +
 2 files changed, 196 insertions(+)

diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index c4bc7b23f42..a41a30fcaaf 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1 +1,2 @@
 DIST dolphin-5.0_p20200705.tar.gz 41580877 BLAKE2B 
78fce8cb10543857633d6678b0ebb8f195e10652b9316f3346d5c84797dea96a31f509f86cb9470b4b9677ca58c4a865494121277cd0bc7dcc93932da9f4
 SHA512 
8b1aed8c98ff7205d7b1716aea3faad0bfa3d1ff3fe3a616431a421ae62592a57887e18295276b7a0fee52d19e641b72d5dc00e071cefea7fbe40adc9f3f01a1
+DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B 
bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862
 SHA512 
5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f

diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
new file mode 100644
index 000..9ca2ed316a3
--- /dev/null
+++ b/games-emulation/dolphin/dolphin-5.0_p20210506.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro 
ru sr sv tr zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit cmake desktop xdg-utils l10n pax-utils
+
+if [[ ${PV} == * ]]
+then
+   EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin;
+   inherit git-r3
+else
+   inherit vcs-snapshot
+   commit=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68
+   
SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64"
+fi
+
+DESCRIPTION="Gamecube and Wii game emulator"
+HOMEPAGE="https://www.dolphin-emu.org/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile 
pulseaudio +qt5 systemd upnp vulkan"
+
+RDEPEND="
+   dev-libs/hidapi:0=
+   >=dev-libs/libfmt-7.1:0=
+   dev-libs/lzo:2=
+   dev-libs/pugixml:0=
+   media-libs/libpng:0=
+   media-libs/libsfml
+   media-libs/mesa[egl]
+   net-libs/enet:1.3
+   net-libs/mbedtls:0=
+   net-misc/curl:0=
+   sys-libs/readline:0=
+   sys-libs/zlib:0=
+   x11-libs/libXext
+   x11-libs/libXi
+   x11-libs/libXrandr
+   virtual/libusb:1
+   virtual/opengl
+   alsa? ( media-libs/alsa-lib )
+   bluetooth? ( net-wireless/bluez )
+   evdev? (
+   dev-libs/libevdev
+   virtual/udev
+   )
+   ffmpeg? ( media-video/ffmpeg:= )
+   profile? ( dev-util/oprofile )
+   pulseaudio? ( media-sound/pulseaudio )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   systemd? ( sys-apps/systemd:0= )
+   upnp? ( net-libs/miniupnpc )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig"
+
+# vulkan-loader required for vulkan backend which can be selected
+# at runtime.
+RDEPEND="${RDEPEND}
+   vulkan? ( media-libs/vulkan-loader )"
+
+src_prepare() {
+   cmake_src_prepare
+
+   # Remove all the bundled libraries that support system-installed
+   # preference. See CMakeLists.txt for conditional 'add_subdirectory' 
calls.
+   local KEEP_SOURCES=(
+   Bochs_disasm
+   FreeSurround
+
+   # vulkan's API is not backwards-compatible:
+   # new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR
+   # but dolphin still relies on it, bug #729832
+   Vulkan
+
+   cpp-optparse
+   # no support for for using system library
+   glslang
+   imgui
+
+   # not packaged, tiny header library
+   rangeset
+
+   # FIXME: xxhash can't be found by cmake
+   xxhash
+   # no support for for using system library
+   minizip
+   # soundtouch uses shorts, not floats
+   soundtouch
+   cubeb
+   discord-rpc
+   # Their build set up solely relies on the build in gtest.
+   gtest
+

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2021-03-28 Thread Sergei Trofimovich

commit: 7daa88b5f535f881a587ccc6afaf3e46888520f3
Author: Samuel BAUER  yahoo  fr>
AuthorDate: Tue Mar 23 22:18:23 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Mar 28 19:11:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7daa88b5

games-emulation/dolphin: refresh live ebuild

Avoid -durty suffix to allow more netplay sessions.
Make vulkan-loader optional.

Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 14b329e33b8..6bf77bf6c3d 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -11,6 +11,7 @@ inherit cmake desktop xdg-utils l10n pax-utils
 if [[ ${PV} == * ]]
 then
EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin;
+   EGIT_SUBMODULES=()
inherit git-r3
 else
inherit vcs-snapshot
@@ -69,7 +70,7 @@ BDEPEND="
 # vulkan-loader required for vulkan backend which can be selected
 # at runtime.
 RDEPEND="${RDEPEND}
-   media-libs/vulkan-loader"
+   vulkan? ( media-libs/vulkan-loader )"
 
 src_prepare() {
cmake_src_prepare
@@ -131,8 +132,11 @@ src_prepare() {
l10n_find_plocales_changes "Languages/po/" "" '.po'
l10n_for_each_disabled_locale_do remove_locale
 
-# About 50% compile-time speedup
+   # About 50% compile-time speedup
use vulkan || sed -i -e '/Externals\/glslang/d' CMakeLists.txt
+
+   # Remove dirty suffix: needed for netplay
+   sed -i -e 's/--dirty/&=""/' CMakeLists.txt
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2020-12-18 Thread Sergei Trofimovich

commit: 60e6c548ccca5eeea06702d4184628a9d51a7a20
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Dec 18 20:48:35 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Dec 18 20:48:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60e6c548

games-emulation/dolphin: raise libfmp up to >=7.1

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index b63534d242d..14b329e33b8 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -28,7 +28,7 @@ IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log 
lto profile pulseaud
 
 RDEPEND="
dev-libs/hidapi:0=
-   dev-libs/libfmt:0=
+   >=dev-libs/libfmt-7.1:0=
dev-libs/lzo:2=
dev-libs/pugixml:0=
media-libs/libpng:0=

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2020-12-02 Thread Sam James

commit: 124d603f8e4cbe1d3484fb925be2dc2f18176508
Author: Roy Bamford  gentoo  org>
AuthorDate: Wed Dec  2 13:46:01 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  2 23:21:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124d603f

games-emulation/dolphin: added ~arm64

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Roy Bamford  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20200705.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
index 1b2cd79579d..e933904d1e5 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
@@ -16,7 +16,7 @@ else
inherit vcs-snapshot
commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b

SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64"
+   KEYWORDS="amd64 ~arm64"
 fi
 
 DESCRIPTION="Gamecube and Wii game emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2020-10-24 Thread Sergei Trofimovich

commit: d4161fcd734dbad7cedb258b4ae412b8630961e9
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 24 18:23:19 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 24 18:23:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4161fcd

games-emulation/dolphin: add USE=vulkan

Patch-by: Samuel BAUER
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 6 +-
 games-emulation/dolphin/metadata.xml| 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 09ecec7709c..b63534d242d 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile 
pulseaudio +qt5 systemd upnp"
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile 
pulseaudio +qt5 systemd upnp vulkan"
 
 RDEPEND="
dev-libs/hidapi:0=
@@ -130,6 +130,9 @@ src_prepare() {
 
l10n_find_plocales_changes "Languages/po/" "" '.po'
l10n_for_each_disabled_locale_do remove_locale
+
+# About 50% compile-time speedup
+   use vulkan || sed -i -e '/Externals\/glslang/d' CMakeLists.txt
 }
 
 src_configure() {
@@ -146,6 +149,7 @@ src_configure() {
-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-DENABLE_QT=$(usex qt5)
-DENABLE_SDL=OFF # not supported: #666558
+   -DENABLE_VULKAN=$(usex vulkan)
-DFASTLOG=$(usex log)
-DOPROFILING=$(usex profile)
-DUSE_DISCORD_PRESENCE=$(usex discord-presence)

diff --git a/games-emulation/dolphin/metadata.xml 
b/games-emulation/dolphin/metadata.xml
index 6c45a696633..965b67caf1e 100644
--- a/games-emulation/dolphin/metadata.xml
+++ b/games-emulation/dolphin/metadata.xml
@@ -9,6 +9,7 @@
Enable evdev input support
Increase logging output
Add support for link-time optimizations.
+   Enable support for Vulkan-based video 
backend.


 Dolphin is a Gamecube and Wii emulator. Most games run perfectly or with minor

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2020-09-11 Thread Sergei Trofimovich

commit: 88259ea9f50de11ed1459c41d5f87262c14fb0d7
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Sep 11 07:52:45 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep 11 07:52:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88259ea9

games-emulation/dolphin: allow new rangeset depend

While at it disable verbose dev cmake warnings.

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 56655d4613a..09ecec7709c 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -89,6 +89,10 @@ src_prepare() {
# no support for for using system library
glslang
imgui
+
+   # not packaged, tiny header library
+   rangeset
+
# FIXME: xxhash can't be found by cmake
xxhash
# no support for for using system library
@@ -152,6 +156,9 @@ src_configure() {
# All dolphin's libraries are private
# and rely on circular dependency resolution.
-DBUILD_SHARED_LIBS=OFF
+
+   # Avoid warning spam around unset variables.
+   -Wno-dev
)
 
cmake_src_configure

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/files/

2020-08-14 Thread Sergei Trofimovich

commit: 17bd64be273a560dc8c64ff50e046646f9038a21
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Aug 14 14:39:24 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Aug 14 21:55:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17bd64be

games-emulation/dolphin: remove unused patch(es)

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17120
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../files/dolphin-5.0-CHAR_WIDTH-collision.patch   | 49 --
 .../dolphin/files/dolphin-5.0-no-pie.patch | 26 
 .../files/dolphin-5.0-soundtouch-exceptions.patch  | 19 -
 .../dolphin/files/dolphin-5.0-xgetbv.patch | 24 ---
 4 files changed, 118 deletions(-)

diff --git 
a/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch 
b/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch
deleted file mode 100644
index d6e4c7a2dc0..000
--- a/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Avoid clash with TS 18661-1:2014 macros
-https://bugs.gentoo.org/637986
-
 a/Source/Core/VideoBackends/OGL/RasterFont.cpp
-+++ b/Source/Core/VideoBackends/OGL/RasterFont.cpp
-@@ -15,7 +15,7 @@
- namespace OGL
- {
- 
--static const int CHAR_WIDTH = 8;
-+static const int DOLPHIN_CHAR_WIDTH = 8;
- static const int CHAR_HEIGHT = 13;
- static const int CHAR_OFFSET = 32;
- static const int CHAR_COUNT = 95;
-@@ -146,20 +146,20 @@
-   glGenTextures(1, );
-   glActiveTexture(GL_TEXTURE8);
-   glBindTexture(GL_TEXTURE_2D, texture);
--  std::vector texture_data(CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT);
-+  std::vector texture_data(DOLPHIN_CHAR_WIDTH * CHAR_COUNT * 
CHAR_HEIGHT);
-   for (int y = 0; y < CHAR_HEIGHT; y++)
-   {
-   for (int c = 0; c < CHAR_COUNT; c++)
-   {
--  for (int x = 0; x < CHAR_WIDTH; x++)
-+  for (int x = 0; x < DOLPHIN_CHAR_WIDTH; x++)
-   {
--  bool pixel = (0 != (rasters[c][y] & (1 << 
(CHAR_WIDTH - x - 1;
--  texture_data[CHAR_WIDTH * CHAR_COUNT * y + 
CHAR_WIDTH * c + x] = pixel ? -1 : 0;
-+  bool pixel = (0 != (rasters[c][y] & (1 << 
(DOLPHIN_CHAR_WIDTH - x - 1;
-+  texture_data[DOLPHIN_CHAR_WIDTH * CHAR_COUNT * 
y + DOLPHIN_CHAR_WIDTH * c + x] = pixel ? -1 : 0;
-   }
-   }
-   }
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
--  glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHAR_WIDTH * CHAR_COUNT, 
CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
-+  glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, DOLPHIN_CHAR_WIDTH * 
CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
- 
-   // generate shader
-   ProgramShaderCache::CompileShader(s_shader, s_vertexShaderSrc, 
s_fragmentShaderSrc);
-@@ -196,7 +196,7 @@
-   std::vector vertices(text.length() * 6 * 4);
- 
-   int usage = 0;
--  GLfloat delta_x = GLfloat(2 * CHAR_WIDTH) / GLfloat(bbWidth);
-+  GLfloat delta_x = GLfloat(2 * DOLPHIN_CHAR_WIDTH) / GLfloat(bbWidth);
-   GLfloat delta_y = GLfloat(2 * CHAR_HEIGHT) / GLfloat(bbHeight);
-   GLfloat border_x = 2.0f / GLfloat(bbWidth);
-   GLfloat border_y = 4.0f / GLfloat(bbHeight);

diff --git a/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch 
b/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch
deleted file mode 100644
index 949e42e50de..000
--- a/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Disable PIE-compatible code generation via -fno-pie.
-
-Before upstream fix:
-https://github.com/dolphin-emu/dolphin/commit/daa03cd1060cc826aca93a1dffc6e94bc6af6d5f
-dolphin assumed executable image to be in low addresses (<2GB)
-and hardcoded 32-bit absolute addresses during JIT phase.
-
-PIE-compatible code does not have this restriction and
-allows mapping binaries above 2GB area (and breaks dolphin's JIT).
-
-Strictly speaking -no-pie (link-time flag) does not or guarantee
-or require low address mapping for binary if it was already built
-as PIC/PIE.
-
-But -fno-pie imposes additional restrictions on generated code by GCC
-and makes -no-pie to take effect.
-Bug: https://bugs.gentoo.org/640124
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -189,4 +189,4 @@ if(NOT ENABLE_GENERIC)
-   set(_M_X86_64 1)
--  add_definitions(-D_M_X86=1 -D_M_X86_64=1 -msse2)
--  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} 
-fno-pie")
-+  add_definitions(-D_M_X86=1 -D_M_X86_64=1 -msse2 
-fno-pie)
-+  set(CMAKE_EXE_LINKER_FLAGS

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2020-08-13 Thread Sergei Trofimovich

commit: 24347823ad6380726eb9f34a0c5b5c96142bab16
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Aug 13 17:51:12 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug 13 17:51:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24347823

games-emulation/dolphin: drop old

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/Manifest   |   1 -
 games-emulation/dolphin/dolphin-5.0.ebuild | 183 -
 games-emulation/dolphin/metadata.xml   |   1 -
 3 files changed, 185 deletions(-)

diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 9062bef840b..c4bc7b23f42 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,2 +1 @@
-DIST dolphin-5.0.tar.gz 38246344 BLAKE2B 
540eb5d0d3f2250d0b562caaef113bcae66ea47c3b6c2884f5612f36f990592d2c83ad0348cb83d71f5329414580f6cbf07081bdef2661bd277ee2f7613dc661
 SHA512 
8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a
 DIST dolphin-5.0_p20200705.tar.gz 41580877 BLAKE2B 
78fce8cb10543857633d6678b0ebb8f195e10652b9316f3346d5c84797dea96a31f509f86cb9470b4b9677ca58c4a865494121277cd0bc7dcc93932da9f4
 SHA512 
8b1aed8c98ff7205d7b1716aea3faad0bfa3d1ff3fe3a616431a421ae62592a57887e18295276b7a0fee52d19e641b72d5dc00e071cefea7fbe40adc9f3f01a1

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
deleted file mode 100644
index 156b83d9fd2..000
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 
pt_BR ro_RO ru sr sv tr zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-WX_GTK_VER="3.0"
-
-inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs 
wxwidgets
-
-SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://www.dolphin-emu.org/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa ao bluetooth doc egl +evdev ffmpeg log lto openal +pch portaudio 
profile pulseaudio qt5 sdl upnp +wxwidgets"
-
-RESTRICT=test
-
-RDEPEND="
-   >=media-libs/libsfml-2.1
-   >net-libs/enet-1.3.7
-   >=net-libs/mbedtls-2.1.1:0=
-   dev-libs/lzo
-   media-libs/libpng:0=
-   sys-libs/readline:0=
-   sys-libs/zlib:=
-   x11-libs/libXext
-   x11-libs/libXi
-   x11-libs/libXrandr
-   virtual/libusb:1
-   virtual/opengl
-   alsa? ( media-libs/alsa-lib )
-   ao? ( media-libs/libao )
-   bluetooth? ( net-wireless/bluez )
-   egl? ( media-libs/mesa[egl] )
-   evdev? (
-   dev-libs/libevdev
-   virtual/udev
-   )
-   ffmpeg? ( media-video/ffmpeg:= )
-   openal? (
-   media-libs/openal
-   media-libs/libsoundtouch
-   )
-   portaudio? ( media-libs/portaudio )
-   profile? ( dev-util/oprofile )
-   pulseaudio? ( media-sound/pulseaudio )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   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]
-   )"
-DEPEND="${RDEPEND}
-   app-arch/zip
-   media-libs/freetype
-   sys-devel/gettext
-   virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch
-   "${FILESDIR}"/${P}-xgetbv.patch
-   "${FILESDIR}"/${P}-no-pie.patch
-   "${FILESDIR}"/${P}-soundtouch-exceptions.patch
-)
-
-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
-
-   # Unconditionally disable LLVM disassembler.
-   sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die
-
-   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, aside

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2020-08-10 Thread Agostino Sarubbo

commit: 040b0a9805acb439dc641be89ffd75ad2377126d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 10 14:33:48 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 10 14:33:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=040b0a98

games-emulation/dolphin: amd64 stable wrt bug #736176

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20200705.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
index 56655d4613a..1b2cd79579d 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
@@ -16,7 +16,7 @@ else
inherit vcs-snapshot
commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b

SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64"
+   KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Gamecube and Wii game emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2020-07-08 Thread Sergei Trofimovich

commit: 477ac5f25c88396e381d29335342157320eb606f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Jul  8 17:09:26 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Jul  8 17:09:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477ac5f2

games-emulation/dolphin: use BDEPEND

While at it drop unused dependencies.

Fix-by: David Michael  gmail.com>
Closes: https://bugs.gentoo.org/731116
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-5.0_p20200705.ebuild | 5 ++---
 games-emulation/dolphin/dolphin-.ebuild  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
index 2c2a6b61d4a..56655d4613a 100644
--- a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
@@ -61,9 +61,8 @@ RDEPEND="
systemd? ( sys-apps/systemd:0= )
upnp? ( net-libs/miniupnpc )
 "
-DEPEND="${RDEPEND}
-   app-arch/zip
-   media-libs/freetype
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-devel/gettext
virtual/pkgconfig"
 

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 2c2a6b61d4a..56655d4613a 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -61,9 +61,8 @@ RDEPEND="
systemd? ( sys-apps/systemd:0= )
upnp? ( net-libs/miniupnpc )
 "
-DEPEND="${RDEPEND}
-   app-arch/zip
-   media-libs/freetype
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-devel/gettext
virtual/pkgconfig"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2020-07-05 Thread Sergei Trofimovich

commit: d96bb099141b0aa85965362b7991e86047f33477
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jul  5 16:43:45 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jul  5 17:26:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d96bb099

games-emulation/dolphin: update to EAPI=7

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 55392d47b0f..706fa7cec8d 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro 
ru sr sv tr zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit cmake-utils desktop gnome2-utils l10n pax-utils
+inherit cmake desktop xdg-utils l10n pax-utils
 
 if [[ ${PV} == * ]]
 then
@@ -71,7 +71,7 @@ RDEPEND="${RDEPEND}
media-libs/vulkan-loader"
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
# Remove all the bundled libraries that support system-installed
# preference. See CMakeLists.txt for conditional 'add_subdirectory' 
calls.
@@ -146,13 +146,18 @@ src_configure() {
-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
-DUSE_SHARED_ENET=ON
-DUSE_UPNP=$(usex upnp)
+
+   # Undo cmake-utils.eclass's defaults.
+   # All dolphin's libraries are private
+   # and rely on circular dependency resolution.
+   -DBUILD_SHARED_LIBS=OFF
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
 
dodoc Readme.md
if use doc; then
@@ -167,9 +172,9 @@ src_install() {
 pkg_postinst() {
# Add pax markings for hardened systems
pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }
 
 pkg_postrm() {
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2020-07-05 Thread Sergei Trofimovich

commit: 600127764509dacd2921b94db82ca20432f9fd5a
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jul  5 17:26:14 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jul  5 17:26:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60012776

games-emulation/dolphin: make 5.0_p20200705 snapshot release

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/Manifest  | 1 +
 .../dolphin/{dolphin-.ebuild => dolphin-5.0_p20200705.ebuild} | 4 +++-
 games-emulation/dolphin/dolphin-.ebuild   | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 94f826d6911..9062bef840b 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1 +1,2 @@
 DIST dolphin-5.0.tar.gz 38246344 BLAKE2B 
540eb5d0d3f2250d0b562caaef113bcae66ea47c3b6c2884f5612f36f990592d2c83ad0348cb83d71f5329414580f6cbf07081bdef2661bd277ee2f7613dc661
 SHA512 
8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a
+DIST dolphin-5.0_p20200705.tar.gz 41580877 BLAKE2B 
78fce8cb10543857633d6678b0ebb8f195e10652b9316f3346d5c84797dea96a31f509f86cb9470b4b9677ca58c4a865494121277cd0bc7dcc93932da9f4
 SHA512 
8b1aed8c98ff7205d7b1716aea3faad0bfa3d1ff3fe3a616431a421ae62592a57887e18295276b7a0fee52d19e641b72d5dc00e071cefea7fbe40adc9f3f01a1

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
similarity index 96%
copy from games-emulation/dolphin/dolphin-.ebuild
copy to games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
index 706fa7cec8d..2c2a6b61d4a 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
@@ -13,7 +13,9 @@ then
EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin;
inherit git-r3
 else
-   SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> 
${P}.zip"
+   inherit vcs-snapshot
+   commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b
+   
SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64"
 fi
 

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 706fa7cec8d..2c2a6b61d4a 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -13,7 +13,9 @@ then
EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin;
inherit git-r3
 else
-   SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> 
${P}.zip"
+   inherit vcs-snapshot
+   commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b
+   
SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64"
 fi

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2020-06-27 Thread Sergei Trofimovich

commit: b72c2184db8e5a08e8b34966acd1d4b787ed5dd1
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun 27 13:08:59 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun 27 13:09:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b72c2184

games-emulation/dolphin: use bundled vulkan-headers

Gentoo's dev-util/vulkan-headers removed API that dolphin relied on.
Let's sue bundled headers. Fix is proposed by Gabriel Marcano.

Reported-by: Gabriel Marcano
Closes: https://bugs.gentoo.org/729832
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 9645554b04f..55392d47b0f 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -61,7 +61,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
app-arch/zip
-   dev-util/vulkan-headers
media-libs/freetype
sys-devel/gettext
virtual/pkgconfig"
@@ -79,6 +78,12 @@ src_prepare() {
local KEEP_SOURCES=(
Bochs_disasm
FreeSurround
+
+   # vulkan's API is not backwards-compatible:
+   # new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR
+   # but dolphin still relies on it, bug #729832
+   Vulkan
+
cpp-optparse
# no support for for using system library
glslang

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2020-05-15 Thread Sergei Trofimovich

commit: e5d0bdbb7b11186afcc616967a8dc57369dd9555
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri May 15 23:06:49 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri May 15 23:12:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d0bdbb

games-emulation/dolphin: allow bundled zstd

dolphin lacks zstd discovery code. Let's use bundled code for now.

Reported-by: Michael Cook
Closes: https://bugs.gentoo.org/723276
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 30c89c3c2a9..9645554b04f 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -96,6 +96,8 @@ src_prepare() {
# gentoo's version requires exception support.
# dolphin disables exceptions and fails the build.
picojson
+   # No code to detect shared library.
+   zstd
)
local s
for s in "${KEEP_SOURCES[@]}"; do

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2020-04-25 Thread Mikle Kolyada

commit: cffb28923edf23bdb14f2e330e9efb82dabb0feb
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Apr 25 20:03:26 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Apr 25 20:03:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cffb2892

games-emulation/dolphin: migrate from libav

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada  gentoo.org>

 games-emulation/dolphin/dolphin-5.0.ebuild  | 7 ++-
 games-emulation/dolphin/dolphin-.ebuild | 7 ++-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
index 153155a8a7a..156b83d9fd2 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav log lto openal +pch 
portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
+IUSE="alsa ao bluetooth doc egl +evdev ffmpeg log lto openal +pch portaudio 
profile pulseaudio qt5 sdl upnp +wxwidgets"
 
 RESTRICT=test
 
@@ -42,10 +42,7 @@ RDEPEND="
dev-libs/libevdev
virtual/udev
)
-   ffmpeg? (
-   libav? ( media-video/libav:= )
-   !libav? ( media-video/ffmpeg:= )
-   )
+   ffmpeg? ( media-video/ffmpeg:= )
openal? (
media-libs/openal
media-libs/libsoundtouch

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index ba80667dcd7..30c89c3c2a9 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg libav log lto profile 
pulseaudio +qt5 systemd upnp"
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile 
pulseaudio +qt5 systemd upnp"
 
 RDEPEND="
dev-libs/hidapi:0=
@@ -48,10 +48,7 @@ RDEPEND="
dev-libs/libevdev
virtual/udev
)
-   ffmpeg? (
-   libav? ( media-video/libav:= )
-   !libav? ( media-video/ffmpeg:= )
-   )
+   ffmpeg? ( media-video/ffmpeg:= )
profile? ( dev-util/oprofile )
pulseaudio? ( media-sound/pulseaudio )
qt5? (

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2020-03-19 Thread Sergei Trofimovich

commit: 1228aa89301d4f9c6f51cb80c5fb0b11d626e7a3
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Mar 19 23:56:20 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Mar 20 00:00:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1228aa89

games-emulation/dolphin: use system version of dev-libs/libfmt

Follow the update pntroduced in
https://github.com/dolphin-emu/dolphin/pull/8198

Reported-by: Samuel BAUER
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 896e7895e99..ba80667dcd7 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -26,6 +26,7 @@ IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg libav 
log lto profile pu
 
 RDEPEND="
dev-libs/hidapi:0=
+   dev-libs/libfmt:0=
dev-libs/lzo:2=
dev-libs/pugixml:0=
media-libs/libpng:0=
@@ -83,7 +84,6 @@ src_prepare() {
FreeSurround
cpp-optparse
# no support for for using system library
-   fmt
glslang
imgui
# FIXME: xxhash can't be found by cmake

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2020-01-09 Thread Sergei Trofimovich

commit: 7b60b2936174d0dcf62caded07e1e5e18f3d04ea
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Jan  9 19:44:54 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Jan  9 19:45:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b60b293

games-emulation/dolphin: depend on mbedtls subslot, bug #705046

It's a fix of regression introduced by
https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a5765256c9a8cf089c304f1dc4b2fe8fc663842

Reported-by: Ben Kohler
Closes: https://bugs.gentoo.org/705046
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-5.0.ebuild  | 4 ++--
 games-emulation/dolphin/dolphin-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
index 38d0e246fd0..153155a8a7a 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,7 @@ RESTRICT=test
 RDEPEND="
>=media-libs/libsfml-2.1
>net-libs/enet-1.3.7
-   >=net-libs/mbedtls-2.1.1:=
+   >=net-libs/mbedtls-2.1.1:0=
dev-libs/lzo
media-libs/libpng:0=
sys-libs/readline:0=

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index dc10a1ac4dc..896e7895e99 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ RDEPEND="
media-libs/libsfml
media-libs/mesa[egl]
net-libs/enet:1.3
-   net-libs/mbedtls
+   net-libs/mbedtls:0=
net-misc/curl:0=
sys-libs/readline:0=
sys-libs/zlib:0=

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2019-11-10 Thread Sergei Trofimovich

commit: d04302eeec95bfa209a612e734c6b5853ca3d11e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov 10 11:10:05 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov 10 11:10:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d04302ee

games-emulation/dolphin: drop unused 'versionator' import

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
index 8bcbe6eda14..38d0e246fd0 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -7,7 +7,7 @@ PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY 
nb nl pl pt pt_B
 PLOCALE_BACKUP="en"
 WX_GTK_VER="3.0"
 
-inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs 
versionator wxwidgets
+inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs 
wxwidgets
 
 SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 KEYWORDS="amd64"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2019-11-10 Thread Sergei Trofimovich

commit: 8cb75ba585a20a0b59e2461ef622e8b5306c727a
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov 10 11:06:56 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov 10 11:10:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb75ba5

games-emulation/dolphin: use '.tar.gz' instead of '.zip' archive

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/Manifest   | 2 +-
 games-emulation/dolphin/dolphin-5.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index ac213471eeb..94f826d6911 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1 +1 @@
-DIST dolphin-5.0.zip 41802909 BLAKE2B 
57fb7741e86b8b5194c9ccaf99e60be0202429209ce98d08aec4ed1d6f47fb347d9149509de7ac1e4bb28435cba35e357b87cf5d29efe2867706dbb3b903c886
 SHA512 
36c4f371e066537331a9a8ec4a17befa278465cdebe258e1cbf1157752ba69bff9c1b8a6e8698bbb650aa257bd48b6b42ee9f61357904b09fd01738af8223d3a
+DIST dolphin-5.0.tar.gz 38246344 BLAKE2B 
540eb5d0d3f2250d0b562caaef113bcae66ea47c3b6c2884f5612f36f990592d2c83ad0348cb83d71f5329414580f6cbf07081bdef2661bd277ee2f7613dc661
 SHA512 
8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
index 871b1246ade..8bcbe6eda14 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -9,7 +9,7 @@ WX_GTK_VER="3.0"
 
 inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs 
versionator wxwidgets
 
-SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 KEYWORDS="amd64"
 
 DESCRIPTION="Gamecube and Wii game emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2019-10-12 Thread Sergei Trofimovich

commit: be895e80341f732760fe5f7a7a1894d12ba45f46
Author: Mohamad Issawi <68k  segv  moe>
AuthorDate: Sat Oct 12 05:11:42 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 12 20:56:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be895e80

games-emulation/dolphin: added missing dependency

Latest dev build requires media-libs/vulkan-loader
to use vulkan backend at runtime in the UI.

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Closes: https://github.com/gentoo/gentoo/pull/13257
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 32d7c5abb2d..dc10a1ac4dc 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -68,6 +68,11 @@ DEPEND="${RDEPEND}
sys-devel/gettext
virtual/pkgconfig"
 
+# vulkan-loader required for vulkan backend which can be selected
+# at runtime.
+RDEPEND="${RDEPEND}
+   media-libs/vulkan-loader"
+
 src_prepare() {
cmake-utils_src_prepare

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2019-06-16 Thread Sergei Trofimovich

commit: e77b38ed20f64a1ae50b05b3d5fb48d7a5424ae5
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jun 16 09:03:18 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jun 16 09:14:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e77b38ed

games-emulation/dolphin: whitelist 'fmt' as bundled, bug #688122

'fmt' is a new 'dolphin' dependency. Currently build system
does not support using system dependency.

Reported-by: Michael Cook
Closes: https://bugs.gentoo.org/688122
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 0fcb0705199..32d7c5abb2d 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -77,6 +77,8 @@ src_prepare() {
Bochs_disasm
FreeSurround
cpp-optparse
+   # no support for for using system library
+   fmt
glslang
imgui
# FIXME: xxhash can't be found by cmake

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/, games-emulation/dolphin/files/

2019-05-25 Thread Sergei Trofimovich

commit: 0e0022cf7c98344343eb04454f8309aacff18b9b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat May 25 22:38:31 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat May 25 22:38:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e0022cf

games-emulation/dolphin: fix libsoundtouch build, bug #686752

Reported-and-fixed-by:  Sławomir Nizio
Closes: https://bugs.gentoo.org/686752
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-5.0.ebuild|  3 ++-
 .../files/dolphin-5.0-soundtouch-exceptions.patch | 19 +++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
index 491d92991be..871b1246ade 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -75,6 +75,7 @@ PATCHES=(
"${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch
"${FILESDIR}"/${P}-xgetbv.patch
"${FILESDIR}"/${P}-no-pie.patch
+   "${FILESDIR}"/${P}-soundtouch-exceptions.patch
 )
 
 src_prepare() {

diff --git 
a/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch 
b/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch
new file mode 100644
index 000..ffd07cf0697
--- /dev/null
+++ b/games-emulation/dolphin/files/dolphin-5.0-soundtouch-exceptions.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/686752
+
+Description: Fix FTBFS with SoundTouch 2.1.2
+ Explicitly disable exceptions in SoundTouch headers because Dolphin
+ is compiled with -fno-exceptions.
+Author: James Cowgill 
+Bug-Debian: https://bugs.debian.org/917671
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Source/Core/AudioCommon/OpenALStream.h
 b/Source/Core/AudioCommon/OpenALStream.h
+@@ -32,6 +32,7 @@
+ #define BOOL SoundTouch_BOOL
+ #endif
+ 
++#define ST_NO_EXCEPTION_HANDLING
+ #include 
+ #include 
+

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2019-02-14 Thread Sergei Trofimovich

commit: b4b299419f8ada0468d1b0ac973bfc1496f1c27c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Feb 14 22:29:01 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Feb 14 22:29:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4b29941

games-emulation/dolphin: whitelist FreeSurround

Reported-by: Michael Cook
Reported-by: Samuel BAUER
Closes: https://bugs.gentoo.org/678020
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index fcc451d6afd..0fcb0705199 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -75,6 +75,7 @@ src_prepare() {
# preference. See CMakeLists.txt for conditional 'add_subdirectory' 
calls.
local KEEP_SOURCES=(
Bochs_disasm
+   FreeSurround
cpp-optparse
glslang
imgui

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2018-11-30 Thread Sergei Trofimovich

commit: dc46355525cbdf66ea0cd142242fda9cc61bca74
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Nov 30 20:26:54 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Nov 30 20:27:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc463555

games-emulation/dolphin: whitelistbundled imgui, bug #672244

Reported-by: Michael Cook
Closes: https://bugs.gentoo.org/672244
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 73a44da431c..fcc451d6afd 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -77,6 +77,7 @@ src_prepare() {
Bochs_disasm
cpp-optparse
glslang
+   imgui
# FIXME: xxhash can't be found by cmake
xxhash
# no support for for using system library

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2018-11-25 Thread Sergei Trofimovich

commit: 03bf5e3c2a8a3f5eb2c20c02d460d9d68ff96f90
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov 25 21:43:55 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov 25 21:44:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03bf5e3c

games-emulation/dolphin: enable USE=egl unconditionally

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 61d3d08da2b..73a44da431c 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc egl +evdev ffmpeg libav log lto 
profile pulseaudio +qt5 systemd upnp"
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg libav log lto profile 
pulseaudio +qt5 systemd upnp"
 
 RDEPEND="
dev-libs/hidapi:0=
@@ -30,6 +30,7 @@ RDEPEND="
dev-libs/pugixml:0=
media-libs/libpng:0=
media-libs/libsfml
+   media-libs/mesa[egl]
net-libs/enet:1.3
net-libs/mbedtls
net-misc/curl:0=
@@ -42,7 +43,6 @@ RDEPEND="
virtual/opengl
alsa? ( media-libs/alsa-lib )
bluetooth? ( net-wireless/bluez )
-   egl? ( media-libs/mesa[egl] )
evdev? (
dev-libs/libevdev
virtual/udev
@@ -131,7 +131,6 @@ src_configure() {
-DFASTLOG=$(usex log)
-DOPROFILING=$(usex profile)
-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
-   -DUSE_EGL=$(usex egl)
-DUSE_SHARED_ENET=ON
-DUSE_UPNP=$(usex upnp)
)

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2018-11-25 Thread Sergei Trofimovich

commit: 2f26b496e55dddef5d8fce650becb4c3db4cc450
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov 25 21:41:44 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov 25 21:44:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f26b496

games-emulation/dolphin: whitelist minizip, bug #671900

Richard reports build failure against live ebuild after
https://github.com/dolphin-emu/dolphin/commit/e6b2758ab401975c0bde2b80bec5b05485c25c5a
upstream update:
  CMake Error at CMakeLists.txt:565 (add_subdirectory):
add_subdirectory given source "Externals/minizip" which
is not an existing directory.

Allow using stripped down minizip.

Reported-by: Richard Yao
Closes: https://bugs.gentoo.org/671900
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dolphin/dolphin-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 3294bace82d..61d3d08da2b 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -79,6 +79,8 @@ src_prepare() {
glslang
# FIXME: xxhash can't be found by cmake
xxhash
+   # no support for for using system library
+   minizip
# soundtouch uses shorts, not floats
soundtouch
cubeb

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2018-09-22 Thread Sergei Trofimovich

commit: 239230b6fe0340b39e7e9cd51037eb826a009d74
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep 22 16:34:15 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep 22 17:04:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=239230b6

games-emulation/dolphin: drop unsupported USE=sdl, bug #666558

As reported by Simon Levermann in https://bugs.gentoo.org/666558
SDL backend handles justicks weaker than default evdev and is
there only for *BSDs.

Reported-by: Simon Levermann
Bug: https://bugs.dolphin-emu.org/issues/11399
Bug: https://bugs.gentoo.org/666558
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 games-emulation/dolphin/dolphin-.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 811fc595d32..3294bace82d 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc egl +evdev ffmpeg libav log lto 
profile pulseaudio +qt5 -sdl systemd upnp"
+IUSE="alsa bluetooth discord-presence doc egl +evdev ffmpeg libav log lto 
profile pulseaudio +qt5 systemd upnp"
 
 RDEPEND="
dev-libs/hidapi:0=
@@ -58,7 +58,6 @@ RDEPEND="
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)
-   sdl? ( media-libs/libsdl2[haptic,joystick] )
systemd? ( sys-apps/systemd:0= )
upnp? ( net-libs/miniupnpc )
 "
@@ -126,7 +125,7 @@ src_configure() {
-DENABLE_LTO=$(usex lto)
-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-DENABLE_QT=$(usex qt5)
-   -DENABLE_SDL=$(usex sdl)
+   -DENABLE_SDL=OFF # not supported: #666558
-DFASTLOG=$(usex log)
-DOPROFILING=$(usex profile)
-DUSE_DISCORD_PRESENCE=$(usex discord-presence)

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2018-09-19 Thread Sergei Trofimovich

commit: e58cf552ba60b6401242ee5e07de53659d34ee56
Author: Simon Levermann  slevermann  de>
AuthorDate: Wed Sep 19 14:14:14 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Sep 19 22:17:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58cf552

games-emulation/dolphin: Disable SDL by default

The desktop profile enables SDL by default, and it's likely that the
desktop profile is being used on a computer that uses dolphin. SDL is
legacy according to upstream and evdev should be used instead.

Package-Manager: Portage-2.3.49, Repoman-2.3.10
Closes: https://bugs.gentoo.org/666558
Signed-off-by: Simon Levermann  slevermann.de>
Closes: https://github.com/gentoo/gentoo/pull/9914

 games-emulation/dolphin/dolphin-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index b22a98646b7..811fc595d32 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa bluetooth discord-presence doc egl +evdev ffmpeg libav log lto 
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="
dev-libs/hidapi:0=

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2018-09-03 Thread Sergei Trofimovich

commit: b019d1acd2401caea4a9566ecbca8391e763d613
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Sep  3 19:11:03 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Sep  3 19:13:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b019d1ac

games-emulation/dolphin: sort mycmakeargs alphabetically

Patch by  Samuel Bauer.

Bug: https://bugs.gentoo.org/561914
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 games-emulation/dolphin/dolphin-.ebuild | 25 +++--
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 2d4a8a1079c..b22a98646b7 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -115,27 +115,24 @@ 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)
-
-   -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

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2018-09-03 Thread Sergei Trofimovich

commit: 7a5765256c9a8cf089c304f1dc4b2fe8fc663842
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Sep  3 19:07:07 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Sep  3 19:13:01 2018 +
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-.ebuild | 49 +++--
 1 file changed, 12 insertions(+), 37 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index b8b2dd91a85..2d4a8a1079c 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.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
 }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2018-07-28 Thread Sergei Trofimovich

commit: 97a3987ca11005a9a5291d5f92f84edd4dfc88f1
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jul 28 17:25:14 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jul 28 17:25:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a3987c

games-emulation/dolphin: unconditionally disable llvm, bug #594940

llvm is used only for debug disassembly and is not detected
by cmake scripts for various reasons.

Let's sort llvm detection upstream first and restore downstream later.

Reported-by: Michał Górny
Closes: https://bugs.gentoo.org/594940
Package-Manager: Portage-2.3.43, Repoman-2.3.10

 games-emulation/dolphin/dolphin-5.0.ebuild  | 12 +++-
 games-emulation/dolphin/dolphin-.ebuild |  7 ++-
 games-emulation/dolphin/metadata.xml|  1 -
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
index 908b571cf42..491d92991be 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -17,7 +17,9 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch 
portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
+IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav log lto openal +pch 
portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
+
+RESTRICT=test
 
 RDEPEND="
>=media-libs/libsfml-2.1
@@ -44,7 +46,6 @@ RDEPEND="
libav? ( media-video/libav:= )
!libav? ( media-video/ffmpeg:= )
)
-   llvm? ( sys-devel/llvm:* )
openal? (
media-libs/openal
media-libs/libsoundtouch
@@ -89,9 +90,10 @@ src_prepare() {
if use !bluetooth; then
sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die
fi
-   if use !llvm; then
-   sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die
-   fi
+
+   # Unconditionally disable LLVM disassembler.
+   sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die
+
if use !openal; then
sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die
fi

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index de76dd90ee6..b8b2dd91a85 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa ao bluetooth discord-presence doc egl +evdev ffmpeg libav llvm log 
lto openal portaudio profile pulseaudio +qt5 sdl systemd upnp"
+IUSE="alsa ao bluetooth discord-presence doc egl +evdev ffmpeg libav log lto 
openal portaudio profile pulseaudio +qt5 sdl systemd upnp"
 
 RDEPEND="
>=media-libs/libsfml-2.1
@@ -52,7 +52,6 @@ RDEPEND="
libav? ( media-video/libav:= )
!libav? ( media-video/ffmpeg:= )
)
-   llvm? ( sys-devel/llvm:* )
openal? (
media-libs/openal
media-libs/libsoundtouch
@@ -89,9 +88,6 @@ src_prepare() {
if use !bluetooth; then
sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die
fi
-   if use !llvm; then
-   sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die
-   fi
if use !openal; then
sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die
fi
@@ -152,6 +148,7 @@ src_configure() {
-DOPROFILING=$(usex profile)
 
-DENABLE_EVDEV=$(usex evdev)
+   -DENABLE_LLVM=OFF
-DENABLE_LTO=$(usex lto)
-DENABLE_QT=$(usex qt5)
-DENABLE_SDL=$(usex sdl)

diff --git a/games-emulation/dolphin/metadata.xml 
b/games-emulation/dolphin/metadata.xml
index 5a7e53ca6e4..34a2a16ae8e 100644
--- a/games-emulation/dolphin/metadata.xml
+++ b/games-emulation/dolphin/metadata.xml
@@ -8,7 +8,6 @@
Enables Discord Rich Presence, 
show the current game on Discord
Enable EGL support
Enable evdev input support
-   Enable the LLVM-based disassembler for 
debugger mode
Increase logging output
Add support for link-time optimizations.

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/files/, games-emulation/dolphin/

2018-07-22 Thread Sergei Trofimovich

commit: 5c1629567172efd3e05e6b9629d18f8fb98c485e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jul 22 20:59:04 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jul 22 21:06:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c162956

games-emulation/dolphin: fix crash on pie-by-default profiles

Disable PIE-compatible code generation via CXXFLAGS+=-fno-pie.

Before upstream fix:
https://github.com/dolphin-emu/dolphin/commit/daa03cd1060cc826aca93a1dffc6e94bc6af6d5f
dolphin assumed executable image to be in low addresses (<2GB)
and hardcoded 32-bit absolute addresses during JIT phase.

PIE-compatible code does not have this restriction and
allows mapping binaries above 2GB area (and breaks dolphin's JIT).

Strictly speaking -no-pie (link-time flag) does not or guarantee
or require low address mapping for binary if it was already built
as PIC/PIE.

But -fno-pie imposes additional restrictions on generated code by GCC
and makes -no-pie to take effect.

We don't need this fix for live ebuild.

Closes: https://bugs.gentoo.org/640124
Package-Manager: Portage-2.3.43, Repoman-2.3.10

 games-emulation/dolphin/dolphin-5.0.ebuild |  1 +
 .../dolphin/files/dolphin-5.0-no-pie.patch | 26 ++
 2 files changed, 27 insertions(+)

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
index 65b49e8a79d..908b571cf42 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -73,6 +73,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
"${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch
"${FILESDIR}"/${P}-xgetbv.patch
+   "${FILESDIR}"/${P}-no-pie.patch
 )
 
 src_prepare() {

diff --git a/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch 
b/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch
new file mode 100644
index 000..949e42e50de
--- /dev/null
+++ b/games-emulation/dolphin/files/dolphin-5.0-no-pie.patch
@@ -0,0 +1,26 @@
+Disable PIE-compatible code generation via -fno-pie.
+
+Before upstream fix:
+https://github.com/dolphin-emu/dolphin/commit/daa03cd1060cc826aca93a1dffc6e94bc6af6d5f
+dolphin assumed executable image to be in low addresses (<2GB)
+and hardcoded 32-bit absolute addresses during JIT phase.
+
+PIE-compatible code does not have this restriction and
+allows mapping binaries above 2GB area (and breaks dolphin's JIT).
+
+Strictly speaking -no-pie (link-time flag) does not or guarantee
+or require low address mapping for binary if it was already built
+as PIC/PIE.
+
+But -fno-pie imposes additional restrictions on generated code by GCC
+and makes -no-pie to take effect.
+Bug: https://bugs.gentoo.org/640124
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -189,4 +189,4 @@ if(NOT ENABLE_GENERIC)
+   set(_M_X86_64 1)
+-  add_definitions(-D_M_X86=1 -D_M_X86_64=1 -msse2)
+-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} 
-fno-pie")
++  add_definitions(-D_M_X86=1 -D_M_X86_64=1 -msse2 
-fno-pie)
++  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} 
-fno-pie -no-pie")
+   else()

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2018-07-22 Thread Sergei Trofimovich

commit: 7bb6ef82a48532432ec66af39d50df7cff3237ff
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jul 22 12:27:16 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jul 22 12:27:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb6ef82

games-emulation/dolphin: adopt an orphan, refresh live ebuild

A few minor changes:
- refreshed locale list (as suggested by the ebuild check)
- moved from EAPI=5 to EAPI=6
- dropped removed WxWidgets UI
- added depends on more bundled libraries

Closes: https://bugs.gentoo.org/561914
Closes: https://bugs.gentoo.org/598625
Closes: https://bugs.gentoo.org/632882
Package-Manager: Portage-2.3.43, Repoman-2.3.10

 games-emulation/dolphin/dolphin-.ebuild | 90 -
 games-emulation/dolphin/metadata.xml|  5 +-
 2 files changed, 54 insertions(+), 41 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 78c1cdbac9d..de76dd90ee6 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-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"
+PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro 
ru sr sv tr zh_CN zh_TW"
 PLOCALE_BACKUP="en"
-WX_GTK_VER="3.0"
 
-inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs 
versionator wxwidgets
+inherit cmake-utils desktop gnome2-utils l10n pax-utils
 
 if [[ ${PV} == * ]]
 then
@@ -23,16 +22,19 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch 
portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
+IUSE="alsa ao bluetooth discord-presence doc egl +evdev ffmpeg libav llvm log 
lto openal portaudio 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/lzo
+   dev-libs/hidapi:0=
+   dev-libs/lzo:2=
+   dev-libs/pugixml:0=
media-libs/libpng:0=
+   net-misc/curl:0=
sys-libs/readline:0=
-   sys-libs/zlib:=
+   sys-libs/zlib:0=
x11-libs/libXext
x11-libs/libXi
x11-libs/libXrandr
@@ -64,14 +66,12 @@ RDEPEND="
dev-qt/qtwidgets:5
)
sdl? ( media-libs/libsdl2[haptic,joystick] )
+   systemd? ( sys-apps/systemd:0= )
upnp? ( >=net-libs/miniupnpc-1.7 )
-   wxwidgets? (
-   dev-libs/glib:2
-   x11-libs/gtk+:2
-   x11-libs/wxGTK:${WX_GTK_VER}[opengl,X]
-   )"
+"
 DEPEND="${RDEPEND}
app-arch/zip
+   dev-util/vulkan-headers
media-libs/freetype
sys-devel/gettext
virtual/pkgconfig"
@@ -102,20 +102,33 @@ src_prepare() {
sed -i -e '/check_lib(PULSEAUDIO/d' CMakeLists.txt || die
fi
 
-   # Remove ALL the bundled libraries, aside from:
-   # - SOIL: The sources are not public.
-   # - Bochs-disasm: Don't know what it is.
-   # - gtest: Their build set up solely relies on the build in gtest.
-   # - xxhash: Not on the tree.
-   mv Externals/SOIL . || die
-   mv Externals/Bochs_disasm . || die
-   mv Externals/gtest . || die
-   mv Externals/xxhash . || die
+   # Remove all the bundled libraries that support system-installed
+   # preference. See CMakeLists.txt for conditional 'add_subdirectory' 
calls.
+   local KEEP_SOURCES=(
+   Bochs_disasm
+   cpp-optparse
+   glslang
+   # FIXME: xxhash can't be found by cmake
+   xxhash
+   # soundtouch uses shorts, not floats
+   soundtouch
+   cubeb
+   discord-rpc
+   # Their build set up solely relies on the build in gtest.
+   gtest
+   # gentoo's version requires exception support.
+   # dolphin disables exceptions and fails the build.
+   picojson
+   )
+   local s
+   for s in "${KEEP_SOURCES[@]}"; do
+   mv -v "Externals/${s}" . || die
+   done
+   einfo "removing sources: $(echo Externals/*)"
rm -r Externals/* || die "Failed to delete Externals dir."
-   mv Bochs_disasm Externals || die
-   mv SOIL Externals || die
-   mv gtest Externals || die
-   mv xxhash Externals || die
+   for s in "${KEEP_SOURCES[@]}"; do
+   mv -v "${s}" "Externals/" || die
+   done
 
remove_locale() {
# Ensure preservation of the backup locale when no valid LINGUA 
is set
@@ -131,23 +144,20 @@ src_prepare() {
 }
 
 src_configure() {
-   if use

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/, games-emulation/dolphin/files/

2018-07-22 Thread Sergei Trofimovich

commit: 0440c6f4dc3c200a4b8a6ce08b74dfdd7dc35d7b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jul 22 10:16:04 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jul 22 10:16:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0440c6f4

games-emulation/dolphin: xgetbv tweak for gcc-8

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 games-emulation/dolphin/dolphin-5.0.ebuild |  5 -
 .../dolphin/files/dolphin-5.0-xgetbv.patch | 24 ++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
index 6110f03b0a0..65b49e8a79d 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -70,7 +70,10 @@ DEPEND="${RDEPEND}
sys-devel/gettext
virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch )
+PATCHES=(
+   "${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch
+   "${FILESDIR}"/${P}-xgetbv.patch
+)
 
 src_prepare() {
cmake-utils_src_prepare

diff --git a/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch 
b/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch
new file mode 100644
index 000..ffa7cc81c13
--- /dev/null
+++ b/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch
@@ -0,0 +1,24 @@
+Workaround collision of _xgetbv intrinsic redeclaration:
+
+Source/Core/Common/x64CPUDetect.cpp:45:12: error: ambiguating new declaration 
of ‘u64 _xgetbv(u32)’
+ static u64 _xgetbv(u32 index)
+^~~
+In file included from 
/usr/lib/gcc/x86_64-pc-linux-gnu/8.1.0/include/x86intrin.h:74,
+ from Source/Core/Common/Intrinsics.h:12,
+ from Source/Core/Common/x64CPUDetect.cpp:10:
+/usr/lib/gcc/x86_64-pc-linux-gnu/8.1.0/include/xsaveintrin.h:60:1: note: old 
declaration ‘long long int _xgetbv(unsigned int)’
+ _xgetbv (unsigned int __A)
+ ^~~
+
+Upstream fied it in
+commit 823fdda30c38be953c3d425874f2adeabed2b5a8
+intrinsics: stop defining _xgetbv/_XCR_XFEATURE_ENABLED_MASK, which are 
reserved
+
+--- a/Source/Core/Common/x64CPUDetect.cpp
 b/Source/Core/Common/x64CPUDetect.cpp
+@@ -45 +45 @@ static inline void __cpuid(int info[4], int function_id)
+-static u64 _xgetbv(u32 index)
++static u64 _xgetbv_dolphin(u32 index)
+@@ -137 +137 @@ void CPUInfo::Detect()
+-  if ((_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
++  if ((_xgetbv_dolphin(_XCR_XFEATURE_ENABLED_MASK) & 0x6) 
== 0x6)

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2018-07-07 Thread David Seifert

commit: c64372fc1691523a841a25fe2b9381a304f4b8a8
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jul  8 04:56:06 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jul  8 04:56:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c64372fc

games-emulation/dolphin: [QA] slot op on net-libs/mbedtls

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 games-emulation/dolphin/dolphin-5.0.ebuild  | 6 +++---
 games-emulation/dolphin/dolphin-.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
index 56737af95d7..6110f03b0a0 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -22,11 +22,11 @@ IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm 
log lto openal +pch por
 RDEPEND="
>=media-libs/libsfml-2.1
>net-libs/enet-1.3.7
-   >=net-libs/mbedtls-2.1.1
+   >=net-libs/mbedtls-2.1.1:=
dev-libs/lzo
media-libs/libpng:0=
sys-libs/readline:0=
-   sys-libs/zlib
+   sys-libs/zlib:=
x11-libs/libXext
x11-libs/libXi
x11-libs/libXrandr
@@ -44,7 +44,7 @@ RDEPEND="
libav? ( media-video/libav:= )
!libav? ( media-video/ffmpeg:= )
)
-   llvm? ( sys-devel/llvm )
+   llvm? ( sys-devel/llvm:* )
openal? (
media-libs/openal
media-libs/libsoundtouch

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 1df45aa1985..78c1cdbac9d 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -28,11 +28,11 @@ IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm 
log lto openal +pch por
 RDEPEND="
>=media-libs/libsfml-2.1
>net-libs/enet-1.3.7
-   >=net-libs/mbedtls-2.1.1
+   >=net-libs/mbedtls-2.1.1:=
dev-libs/lzo
media-libs/libpng:0=
sys-libs/readline:0=
-   sys-libs/zlib
+   sys-libs/zlib:=
x11-libs/libXext
x11-libs/libXi
x11-libs/libXrandr
@@ -50,7 +50,7 @@ RDEPEND="
libav? ( media-video/libav:= )
!libav? ( media-video/ffmpeg:= )
)
-   llvm? ( sys-devel/llvm )
+   llvm? ( sys-devel/llvm:* )
openal? (
media-libs/openal
media-libs/libsoundtouch

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2018-01-13 Thread David Seifert

commit: 04620f343c1a03f54685b0848b59f2f2d2b3ffbb
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jan 13 23:10:13 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan 13 23:15:00 2018 +
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-.ebuild | 69 ++---
 1 file changed, 24 insertions(+), 45 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index b726d122197..f6dddcb6d01 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.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} == * ]]
+if [[ ${PV} == * ]]
 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

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2018-01-13 Thread David Seifert

commit: 77a83e39aab60e0e6dd153437ed58d0c9177faee
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jan 13 23:14:08 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jan 13 23:15:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77a83e39

games-emulation/dolphin: [QA] Add call to 'gnome2_icon_cache_update'

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 games-emulation/dolphin/dolphin-5.0.ebuild  | 8 +++-
 games-emulation/dolphin/dolphin-.ebuild | 8 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
index 19005325105..56737af95d7 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -7,7 +7,7 @@ PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY 
nb nl pl pt pt_B
 PLOCALE_BACKUP="en"
 WX_GTK_VER="3.0"
 
-inherit cmake-utils desktop l10n pax-utils toolchain-funcs versionator 
wxwidgets
+inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs 
versionator wxwidgets
 
 SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
 KEYWORDS="amd64"
@@ -170,4 +170,10 @@ pkg_postinst() {
ewarn "If you want microphone capabilities in dolphin-emu, 
rebuild with"
ewarn "USE=\"portaudio\""
fi
+
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
 }

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index f6dddcb6d01..1df45aa1985 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -7,7 +7,7 @@ PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY 
nb nl pl pt pt_B
 PLOCALE_BACKUP="en"
 WX_GTK_VER="3.0"
 
-inherit cmake-utils desktop l10n pax-utils toolchain-funcs versionator 
wxwidgets
+inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs 
versionator wxwidgets
 
 if [[ ${PV} == * ]]
 then
@@ -174,4 +174,10 @@ pkg_postinst() {
ewarn "If you want microphone capabilities in dolphin-emu, 
rebuild with"
ewarn "USE=\"portaudio\""
fi
+
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
 }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/, games-emulation/dolphin/files/

2018-01-11 Thread David Seifert

commit: ef8bb10ad88faeaf84a9ff6133507413618bd41d
Author: David Seifert  gentoo  org>
AuthorDate: Thu Jan 11 10:24:41 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jan 11 10:35:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef8bb10a

games-emulation/dolphin: Fix building with new glibc

Closes: https://bugs.gentoo.org/637986
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 games-emulation/dolphin/dolphin-5.0.ebuild | 64 --
 .../files/dolphin-5.0-CHAR_WIDTH-collision.patch   | 49 +
 2 files changed, 72 insertions(+), 41 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
index 66b0fe9c7da..19005325105 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY 
nb nl pl pt pt_B
 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
 
 SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
 KEYWORDS="amd64"
@@ -17,15 +17,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
@@ -37,14 +37,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 )
@@ -57,35 +60,20 @@ 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"
 
-}
+PATCHES=( "${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch )
 
 src_prepare() {
+   cmake-utils_src_prepare
 
# Remove automatic dependencies to prevent building without flags 
enabled.
if use !alsa; then
@@ -139,13 +127,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 )
@@ -162,12 +149,7 @@ src_configure() {
cmake-utils_src_configure
 }
 
-src_compile() {
-
-   cmake-utils_src_compile
-}
 src_install() {
-
cmake-utils_src_install
 
dodoc Readme.md

diff --git 
a/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2016-12-19 Thread Tobias Klausmann

commit: 33d4a226789fc93c1443482375b872fb3076f392
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Mon Dec 19 14:13:12 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Mon Dec 19 14:13:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33d4a226

games-emulation/dolphin-5.0-r0: stable on amd64

Gentoo-Bug: 501546

 games-emulation/dolphin/dolphin-5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
index 88cd984..8f6e611 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -11,7 +11,7 @@ WX_GTK_VER="3.0"
 inherit cmake-utils eutils l10n pax-utils toolchain-funcs versionator wxwidgets
 
 SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Gamecube and Wii game emulator"
 HOMEPAGE="https://www.dolphin-emu.org/;

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/files/

2016-11-17 Thread Michael Palimaka

commit: 3d5c2acaa71b0c1b65738d2ef2d6ede47f2fb76b
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Wed Nov 16 20:40:27 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Nov 17 12:08:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d5c2aca

games-emulation/dolphin: remove unused patches

 .../files/dolphin-5.0-dynamic-llvm-detect.patch|  54 --
 .../files/dolphin-5.0-miniupnpc-abi-14.patch   | 137 -
 .../dolphin/files/dolphin-emu-3.5-gcc-4.8.patch| 211 -
 3 files changed, 402 deletions(-)

diff --git 
a/games-emulation/dolphin/files/dolphin-5.0-dynamic-llvm-detect.patch 
b/games-emulation/dolphin/files/dolphin-5.0-dynamic-llvm-detect.patch
deleted file mode 100644
index 798ec56..
--- a/games-emulation/dolphin/files/dolphin-5.0-dynamic-llvm-detect.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1515497ab88dc2452ed0db20a4610663cd04ff21 Mon Sep 17 00:00:00 2001
-From: comex 
-Date: Tue, 7 Jul 2015 07:49:46 -0400
-Subject: [PATCH] Make the LLVM detect script verify that the dynamic library 
actually exists.
-
-For some dumb reason, llvm-config doesn't provide the flags to link
-against the dynamic library copy of LLVM (as opposed to static), so the
-script has to guess the library name.  However, in some installations
-(such as mine), there is no dynamic copy, which caused Dolphin to fail
-to link.  Change the script to do a link test.  If it fails, one option
-would be to fall back on static linking, but I just have it fail to
-detect LLVM, because statically linking Dolphin against LLVM is really
-not a great idea - huge binary, long link time.

- CMakeTests/FindLLVM.cmake | 12 +---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeTests/FindLLVM.cmake b/CMakeTests/FindLLVM.cmake
-index 7fe664f..cfcfaed 100644
 a/CMakeTests/FindLLVM.cmake
-+++ b/CMakeTests/FindLLVM.cmake
-@@ -1,6 +1,9 @@
- # This file only exists because LLVM's cmake files are broken.
- # This affects both LLVM 3.4 and 3.5.
- # Hopefully when they fix their cmake system we don't need this garbage.
-+
-+include(CheckLibraryExists)
-+
- list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config")
- list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config-3.5")
- list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config-3.4")
-@@ -11,13 +14,16 @@ foreach(LLVM_CONFIG_NAME ${LLVM_CONFIG_EXECUTABLES})
-   execute_process(COMMAND ${LLVM_CONFIG_EXE} --version 
OUTPUT_VARIABLE LLVM_PACKAGE_VERSION
-   OUTPUT_STRIP_TRAILING_WHITESPACE )
-   if (${LLVM_PACKAGE_VERSION} VERSION_GREATER "3.3")
--  set(LLVM_FOUND 1)
-   execute_process(COMMAND ${LLVM_CONFIG_EXE} --includedir 
OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
-   OUTPUT_STRIP_TRAILING_WHITESPACE )
-   execute_process(COMMAND ${LLVM_CONFIG_EXE} --ldflags 
OUTPUT_VARIABLE LLVM_LDFLAGS
-   OUTPUT_STRIP_TRAILING_WHITESPACE )
--  set(LLVM_LIBRARIES "${LLVM_LDFLAGS} 
-lLLVM-${LLVM_PACKAGE_VERSION}")
--  break()
-+  check_library_exists(LLVM-${LLVM_PACKAGE_VERSION} 
LLVMVerifyFunction "${LLVM_LDFLAGS}" HAVE_DYNAMIC_LLVM_${LLVM_PACKAGE_VERSION})
-+  if (HAVE_DYNAMIC_LLVM_${LLVM_PACKAGE_VERSION})
-+  set(LLVM_LIBRARIES "${LLVM_LDFLAGS} 
-lLLVM-${LLVM_PACKAGE_VERSION}")
-+  set(LLVM_FOUND 1)
-+  break()
-+  endif()
-   endif()
-   endif()
- endforeach()
--- 
-2.6.2
-

diff --git a/games-emulation/dolphin/files/dolphin-5.0-miniupnpc-abi-14.patch 
b/games-emulation/dolphin/files/dolphin-5.0-miniupnpc-abi-14.patch
deleted file mode 100644
index ecb6abb..
--- a/games-emulation/dolphin/files/dolphin-5.0-miniupnpc-abi-14.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 8c5744bca705a0895bd51c966a30171ee2bab43a Mon Sep 17 00:00:00 2001
-From: Marisa Kirisame 
-Date: Tue, 29 Sep 2015 23:10:31 +0200
-Subject: [PATCH] miniupnpc API version 14 changed the upnpDiscover functions,
- adding an argument for TTL (should default to 2) this enables support for
- that should the build system have that specific version installed, the
- miniupnpc bundled in the project is unchanged
-

- CMakeLists.txt |  5 -
- CMakeTests/FindMiniupnpc.cmake | 39 +-
- Source/Core/Core/NetPlayServer.cpp |  4 
- 3 files changed, 42 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 291efee..7ac0679 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -690,9 +690,12 @@ if(USE_UPNP)
-   if(NOT APPLE AND NOT ANDROID)
-   include(FindMiniupnpc)
-   endif()
--  if(MINIUPNP_FOUND AND

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2016-06-24 Thread Devan Franchini

commit: 7318d367fb3a59f0ba696921b3513fedf28b751f
Author: Devan Franchini  gentoo  org>
AuthorDate: Sat Jun 25 02:20:01 2016 +
Commit: Devan Franchini  gentoo  org>
CommitDate: Sat Jun 25 02:29:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7318d367

games-emulation/dolphin: Updates package version to reflect new release

Package-Manager: portage-2.3.0

 games-emulation/dolphin/Manifest   |   2 +-
 games-emulation/dolphin/dolphin-5.0.ebuild | 106 -
 2 files changed, 74 insertions(+), 34 deletions(-)

diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 2cc1c50..1cc674f 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1 +1 @@
-DIST dolphin-5.0.zip 28317729 SHA256 
2b1003360d52baf12a1bcd4d75f379749b0fd4001948ec1a24d0539c37aae055 SHA512 
1b1c0dd6da4ba7e9ffe30499fae582b922c9bbd8b3d8159fbf9f4bfa1e744ef5b4c00a85d34f7cdd6e01efa32133f59b2a1f42cafc9d620f7fc7462c4ba73615
 WHIRLPOOL 
73cc25bafcb0d32592e8ad799b0a3d458cfa944ad15380a3b8f1cf27f3e024c314b08469a17f6d92edced95631bba38e39e1ccd625227c0520813abbd399e0f4
+DIST dolphin-5.0.zip 41802909 SHA256 
f8c26bdea7a8329873bd2c485676ba5cbc1670faad3fef98f1d516254b4dd3a1 SHA512 
36c4f371e066537331a9a8ec4a17befa278465cdebe258e1cbf1157752ba69bff9c1b8a6e8698bbb650aa257bd48b6b42ee9f61357904b09fd01738af8223d3a
 WHIRLPOOL 
401d569e1b45a8873a2f7879a5d9c931228767be909c9ddde43d49394a79580c2ae0eccc29757f471565ad0554cd20e57c371393526d68b2c79f8570a2e2bd5c

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
index d7266c1..88cd984 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -4,11 +4,13 @@
 
 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 
pt_BR ro_RO ru sr sv tr zh_CN zh_TW"
+PLOCALE_BACKUP="en"
 WX_GTK_VER="3.0"
 
-inherit cmake-utils eutils pax-utils toolchain-funcs versionator wxwidgets 
games
+inherit cmake-utils eutils l10n pax-utils toolchain-funcs versionator wxwidgets
 
-SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}-rc.zip -> ${P}.zip"
+SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
 KEYWORDS="~amd64"
 
 DESCRIPTION="Gamecube and Wii game emulator"
@@ -16,35 +18,58 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa ao bluetooth doc ffmpeg lto +lzo openal opengl openmp portaudio 
pulseaudio"
+IUSE="alsa ao bluetooth doc egl +evdev ffmpeg llvm log lto openal +pch 
portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
 
-S=${WORKDIR}/${P}-rc/
-RDEPEND=">=media-libs/glew-1.10
-   >=media-libs/libsfml-2.1
-   >=net-libs/miniupnpc-1.8
+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:=
+   sys-libs/zlib
x11-libs/libXext
+   x11-libs/libXi
x11-libs/libXrandr
-   media-libs/libsdl2[haptic,joystick]
-   net-libs/polarssl[havege]
+   virtual/libusb:1
+   virtual/opengl
alsa? ( media-libs/alsa-lib )
ao? ( media-libs/libao )
bluetooth? ( net-wireless/bluez )
+   egl? ( media-libs/mesa[egl] )
+   evdev? (
+   dev-libs/libevdev
+   virtual/udev
+   )
ffmpeg? ( virtual/ffmpeg )
-   lzo? ( dev-libs/lzo )
-   openal? ( media-libs/openal )
-   opengl? ( virtual/opengl )
+   llvm? ( sys-devel/llvm )
+   openal? (
+   media-libs/openal
+   media-libs/libsoundtouch
+   )
portaudio? ( media-libs/portaudio )
+   profile? ( dev-util/oprofile )
pulseaudio? ( media-sound/pulseaudio )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   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]
+   )
"
 DEPEND="${RDEPEND}
+   >=dev-util/cmake-2.8.8
+   >=sys-devel/gcc-4.9.0
app-arch/zip
-   media-gfx/nvidia-cg-toolkit
media-libs/freetype
-   media-libs/libsoundtouch
-   >net-libs/enet-1.3.7
-   >=sys-devel/gcc-4.9.0
-   x11-libs/wxGTK:${WX_GTK_VER}
+   sys-devel/gettext
+   virtual/pkgconfig
"
 
 pkg_pretend() {
@@ -63,9 +88,6 @@ pkg_pretend() {
 
 src_prepare() {
 
-   epatch "${FILESDIR}"/"${P}"-dynamic-llvm-detect.patch
-   epatch "${FILESDIR}"/"${P}"-miniupnpc-abi-14.patch
-
# Remove automatic dependencies to prevent building without flags 
enabled.
if use !alsa; then
sed

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2016-06-24 Thread Devan Franchini

commit: 0516d7c424145151ac5cb95dc4aad988e47e3045
Author: Devan Franchini  gentoo  org>
AuthorDate: Sat Jun 25 02:27:00 2016 +
Commit: Devan Franchini  gentoo  org>
CommitDate: Sat Jun 25 02:30:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0516d7c4

games-emulation/dolphin: Updates locales and QT flag, bug #561914

Package-Manager: portage-2.3.0

 games-emulation/dolphin/dolphin-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index bb207fe..540052d 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PLOCALES="ar ca cs de el en es fa fr he hu it ja ko nb nl pl pt_BR pt 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_BR 
pt ro_RO ru sr sv tr zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 WX_GTK_VER="3.0"
 
@@ -161,7 +161,7 @@ src_configure() {
$( cmake-utils_use_enable evdev EVDEV )
$( cmake-utils_use_enable lto LTO )
$( cmake-utils_use_enable pch PCH )
-   $( cmake-utils_use_enable qt5 QT )
+   $( cmake-utils_use_enable qt5 QT2 )
$( cmake-utils_use_enable sdl SDL )
$( cmake-utils_use_use egl EGL )
$( cmake-utils_use_use upnp UPNP )

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2016-05-08 Thread Michael Sterrett

commit: 23a37c9b1224d607a6401b13ddd897cb198a3d59
Author: Michael Sterrett  gentoo  org>
AuthorDate: Mon May  9 01:44:13 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Mon May  9 01:44:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a37c9b

games-emulation/dolphin: clean old (last user of libsfml-1)

Package-Manager: portage-2.2.26

 games-emulation/dolphin/Manifest|   2 -
 games-emulation/dolphin/dolphin-4.0-r2.ebuild   | 154 ---
 games-emulation/dolphin/dolphin-4.0.2-r7.ebuild | 155 
 3 files changed, 311 deletions(-)

diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 7bdb097..2cc1c50 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,3 +1 @@
-DIST dolphin-4.0.2.zip 28261421 SHA256 
f20c824ee83c3a495fd019747d2f8254477b94c135415b386142f89716d05d66 SHA512 
5b1931a133fd431b8f03f47c4c1cfe89f752de17f792e2729421df439564d15a8e35b17e82e31cef99230157de4aa16b2572b28ad67f23ca23c5492972df2938
 WHIRLPOOL 
48dcc47de02e6aa25e5318bc2564df1ab510210556e3e7c9442f405abd04879b8cff85afb5f1fa7a36364902a472f18bf5fa8da3a9db59b915d41d4e60f3b235
-DIST dolphin-4.0.zip 23439392 SHA256 
a698caf05f47a55c30e09d0aab053a412df683de2e139a6348156b03c502a0ec SHA512 
02e366c2fa95ab5f37b0a66b94a5b56a632ef81e13febd982d6385cfaf7fa3edb4364180d4b8312e82bc7b8f150d02cde10248996f6a12286a20d684024aca20
 WHIRLPOOL 
0cb7b28b91f4b7bf93c56f2dd31d080e7e0418fb53d9cc9093ca995d2c99a1fa7d5d82111e2c8db363e2b07384be39ec0062ab0252233f480b8e45e9304e
 DIST dolphin-5.0.zip 28317729 SHA256 
2b1003360d52baf12a1bcd4d75f379749b0fd4001948ec1a24d0539c37aae055 SHA512 
1b1c0dd6da4ba7e9ffe30499fae582b922c9bbd8b3d8159fbf9f4bfa1e744ef5b4c00a85d34f7cdd6e01efa32133f59b2a1f42cafc9d620f7fc7462c4ba73615
 WHIRLPOOL 
73cc25bafcb0d32592e8ad799b0a3d458cfa944ad15380a3b8f1cf27f3e024c314b08469a17f6d92edced95631bba38e39e1ccd625227c0520813abbd399e0f4

diff --git a/games-emulation/dolphin/dolphin-4.0-r2.ebuild 
b/games-emulation/dolphin/dolphin-4.0-r2.ebuild
deleted file mode 100644
index a326e47..000
--- a/games-emulation/dolphin/dolphin-4.0-r2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.9"
-
-inherit cmake-utils eutils pax-utils toolchain-funcs versionator wxwidgets 
games
-
-SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://www.dolphin-emu.org/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa ao bluetooth doc ffmpeg +lzo openal opengl openmp portaudio 
pulseaudio"
-
-RESTRICT="mirror"
-
-RDEPEND=">=media-libs/glew-1.6
-   >=media-libs/libsdl-1.2[joystick]
-   =net-libs/miniupnpc-1.8
-   sys-libs/readline:=
-   x11-libs/libXext
-   x11-libs/libXrandr
-   alsa? ( media-libs/alsa-lib )
-   ao? ( media-libs/libao )
-   bluetooth? ( net-wireless/bluez )
-   ffmpeg? ( virtual/ffmpeg )
-   lzo? ( dev-libs/lzo )
-   openal? ( media-libs/openal )
-   opengl? ( virtual/opengl )
-   portaudio? ( media-libs/portaudio )
-   pulseaudio? ( media-sound/pulseaudio )
-   "
-DEPEND="${RDEPEND}
-   app-arch/zip
-   media-gfx/nvidia-cg-toolkit
-   media-libs/freetype
-   media-libs/libsoundtouch
-   >=sys-devel/gcc-4.6.0
-   x11-libs/wxGTK:2.9
-   "
-
-pkg_pretend() {
-
-   local ver=4.6.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
-
-}
-
-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, aside from:
-   # - SOIL: The sources are not public.
-   # - Bochs-disasm: Don't know what it is.
-   # - CLRun: Part of OpenCL
-   # - polarssl: Currently fails the check as is.
-   mv Externals/SOIL . || die
-   mv Externals/Bochs_disasm . || die
-

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2016-04-02 Thread Devan Franchini

commit: d8232901b67b237a3f78d7845b0abbfc8d70363c
Author: Devan Franchini  gentoo  org>
AuthorDate: Sat Apr  2 19:35:52 2016 +
Commit: Devan Franchini  gentoo  org>
CommitDate: Sat Apr  2 19:37:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8232901

Removes games eclass usage & changes desktop icon location, bug #561914

Package-Manager: portage-2.2.27

 games-emulation/dolphin/dolphin-.ebuild | 14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 981b451..bb207fe 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -8,7 +8,7 @@ PLOCALES="ar ca cs de el en es fa fr he hu it ja ko nb nl pl 
pt_BR pt ru sr sv t
 PLOCALE_BACKUP="en"
 WX_GTK_VER="3.0"
 
-inherit cmake-utils eutils l10n pax-utils toolchain-funcs versionator 
wxwidgets games
+inherit cmake-utils eutils l10n pax-utils toolchain-funcs versionator wxwidgets
 
 if [[ ${PV} == * ]]
 then
@@ -153,10 +153,6 @@ src_configure() {
fi
 
local mycmakeargs=(
-   "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
-   "-Dprefix=${GAMES_PREFIX}"
-   "-Ddatadir=${GAMES_DATADIR}/${PN}"
-   "-Dplugindir=$(games_get_libdir)/${PN}"
"-DUSE_SHARED_ENET=ON"
$( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS )
$( cmake-utils_use log FASTLOG )
@@ -187,11 +183,9 @@ src_install() {
dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
fi
 
-   doicon -s 48 Installer/dolphin-emu.png
-   doicon -s scalable Installer/dolphin-emu.svg
-   make_desktop_entry "dolphin-emu" "Dolphin Emulator" "dolphin-emu" 
"Game;Emulator;"
-
-   prepgamesdirs
+   doicon -s 48 Data/dolphin-emu.png
+   doicon -s scalable Data/dolphin-emu.svg
+   doicon Data/dolphin-emu.svg
 }
 
 pkg_postinst() {

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2016-04-02 Thread Devan Franchini

commit: 09d9cf4a9308e973e82ca03982a18e456ed37f60
Author: Devan Franchini  gentoo  org>
AuthorDate: Sat Apr  2 04:17:18 2016 +
Commit: Devan Franchini  gentoo  org>
CommitDate: Sat Apr  2 19:37:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09d9cf4a

Adds LINGUAS support to ebuid, bug #561914

Package-Manager: portage-2.2.27

 games-emulation/dolphin/dolphin-.ebuild | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index b12563f..981b451 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -4,9 +4,11 @@
 
 EAPI=5
 
+PLOCALES="ar ca cs de el en es fa fr he hu it ja ko nb nl pl pt_BR pt ru sr sv 
tr zh_CN zh_TW"
+PLOCALE_BACKUP="en"
 WX_GTK_VER="3.0"
 
-inherit cmake-utils eutils pax-utils toolchain-funcs versionator wxwidgets 
games
+inherit cmake-utils eutils l10n pax-utils toolchain-funcs versionator 
wxwidgets games
 
 if [[ ${PV} == * ]]
 then
@@ -130,6 +132,18 @@ src_prepare() {
mv SOIL Externals || die
mv gtest Externals || die
mv xxhash Externals || die
+
+   remove_locale() {
+   # Ensure preservation of the backup locale when no valid LINGUA 
is set
+   if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ 
"${PLOCALE_BACKUP}" == "$(l10n_get_locales)" ]]; then
+   return
+   else
+   rm "Languages/po/${1}.po" || die
+   fi
+   }
+
+   l10n_find_plocales_changes "Languages/po/" "" '.po'
+   l10n_for_each_disabled_locale_do remove_locale
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2016-03-06 Thread Devan Franchini

commit: afdcf3ed433747f8d69b6e8690f999426d16c1f7
Author: Devan Franchini  gentoo  org>
AuthorDate: Sat Mar  5 05:59:54 2016 +
Commit: Devan Franchini  gentoo  org>
CommitDate: Sat Mar  5 05:59:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afdcf3ed

Replaces xpm icon with png and svg, bug #575420

Package-Manager: portage-2.2.27

 games-emulation/dolphin/dolphin-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 1b11576..b12563f 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -173,7 +173,8 @@ src_install() {
dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
fi
 
-   doicon Installer/dolphin-emu.xpm
+   doicon -s 48 Installer/dolphin-emu.png
+   doicon -s scalable Installer/dolphin-emu.svg
make_desktop_entry "dolphin-emu" "Dolphin Emulator" "dolphin-emu" 
"Game;Emulator;"
 
prepgamesdirs

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2016-03-06 Thread Devan Franchini

commit: 4128669fc0ee4549b9ed33cbb0530bcb2881c20c
Author: Devan Franchini  gentoo  org>
AuthorDate: Sat Mar  5 05:48:16 2016 +
Commit: Devan Franchini  gentoo  org>
CommitDate: Sat Mar  5 05:48:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4128669f

Removes DOLPHIN_WC_REVISION, bug #576090

Package-Manager: portage-2.2.27

 games-emulation/dolphin/dolphin-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 33a6bf8..1b11576 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -139,7 +139,6 @@ src_configure() {
fi
 
local mycmakeargs=(
-   "-DDOLPHIN_WC_REVISION=${PV}"
"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
"-Dprefix=${GAMES_PREFIX}"
"-Ddatadir=${GAMES_DATADIR}/${PN}"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2016-01-13 Thread Devan Franchini

commit: 40cd1e1305bbc6dfe82c27ad3b78f4556527a2d0
Author: Devan Franchini  gentoo  org>
AuthorDate: Wed Jan 13 20:48:57 2016 +
Commit: Devan Franchini  gentoo  org>
CommitDate: Wed Jan 13 20:49:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40cd1e13

games-emulation/dolphin: Removes saving of GL external folder

The GL external folder is no longer used and attempting to save it will cause
a failure when running the ebuild.

X-Gentoo-Bug: 571272
X-Gentoo-Bug-URL: https://bugs.gentoo.org/571272

Package-Manager: portage-2.2.24

 games-emulation/dolphin/dolphin-.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index c44022a..33a6bf8 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -119,18 +119,15 @@ src_prepare() {
# Remove ALL the bundled libraries, aside from:
# - SOIL: The sources are not public.
# - Bochs-disasm: Don't know what it is.
-   # - GL: A custom gl.h file is used.
# - gtest: Their build set up solely relies on the build in gtest.
# - xxhash: Not on the tree.
mv Externals/SOIL . || die
mv Externals/Bochs_disasm . || die
-   mv Externals/GL . || die
mv Externals/gtest . || die
mv Externals/xxhash . || die
rm -r Externals/* || die "Failed to delete Externals dir."
mv Bochs_disasm Externals || die
mv SOIL Externals || die
-   mv GL Externals || die
mv gtest Externals || die
mv xxhash Externals || die
 }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2016-01-06 Thread Devan Franchini

commit: d3acb63326a3851279b633af595d044f9887261b
Author: Devan Franchini  gentoo  org>
AuthorDate: Thu Jan  7 04:23:38 2016 +
Commit: Devan Franchini  gentoo  org>
CommitDate: Thu Jan  7 04:23:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3acb633

Fully removes all libav restrictions, bug #570346

Package-Manager: portage-2.2.24

 games-emulation/dolphin/dolphin-5.0.ebuild  | 3 +--
 games-emulation/dolphin/dolphin-.ebuild | 5 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
index 049c144..d7266c1 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -30,8 +30,7 @@ RDEPEND=">=media-libs/glew-1.10
alsa? ( media-libs/alsa-lib )
ao? ( media-libs/libao )
bluetooth? ( net-wireless/bluez )
-   ffmpeg? ( virtual/ffmpeg
- !!media-video/libav )
+   ffmpeg? ( virtual/ffmpeg )
lzo? ( dev-libs/lzo )
openal? ( media-libs/openal )
opengl? ( virtual/opengl )

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 1ee2c85..c44022a 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -46,10 +46,7 @@ RDEPEND=">=media-libs/libsfml-2.1
dev-libs/libevdev
virtual/udev
)
-   ffmpeg? (
-   virtual/ffmpeg
-   !!media-video/libav
-   )
+   ffmpeg? ( virtual/ffmpeg )
llvm? ( sys-devel/llvm )
openal? (
media-libs/openal

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2016-01-01 Thread Devan Franchini

commit: 179974d8e90764da35d6b415b77f0b23ebe16bd8
Author: Devan Franchini  gentoo  org>
AuthorDate: Sat Jan  2 01:40:31 2016 +
Commit: Devan Franchini  gentoo  org>
CommitDate: Sat Jan  2 01:40:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=179974d8

Removes uneeded version limit on libav

X-Gentoo-Bug: 570346
X-Gentoo-Bug-URL: https://bugs.gentoo.org/570346

 games-emulation/dolphin/dolphin-5.0.ebuild  | 4 ++--
 games-emulation/dolphin/dolphin-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
index 9ef670f..049c144 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -31,7 +31,7 @@ RDEPEND=">=media-libs/glew-1.10
ao? ( media-libs/libao )
bluetooth? ( net-wireless/bluez )
ffmpeg? ( virtual/ffmpeg
-   !!>=media-video/libav-10 )
+ !!media-video/libav )
lzo? ( dev-libs/lzo )
openal? ( media-libs/openal )
opengl? ( virtual/opengl )

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 4e80f29..1ee2c85 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -48,7 +48,7 @@ RDEPEND=">=media-libs/libsfml-2.1
)
ffmpeg? (
virtual/ffmpeg
-   !!>=media-video/libav-10
+   !!media-video/libav
)
llvm? ( sys-devel/llvm )
openal? (

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2015-12-13 Thread Devan Franchini

commit: 513e6ee31448d19d4eb3b4484baf349621a38bd3
Author: Devan Franchini  gentoo  org>
AuthorDate: Sun Dec 13 21:17:58 2015 +
Commit: Devan Franchini  gentoo  org>
CommitDate: Sun Dec 13 21:18:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=513e6ee3

games-emulation/dolphin: Removes unneeded dependencies

Also adds lzo and libpng as explicit deps

Package-Manager: portage-2.2.24

 games-emulation/dolphin/dolphin-.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index 5b8f798..4e80f29 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -23,12 +23,13 @@ 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 llvm log lto openal +pch 
portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
 
-RDEPEND=">=media-libs/glew-1.10
-   >=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:=
sys-libs/zlib
@@ -74,7 +75,6 @@ DEPEND="${RDEPEND}
>=dev-util/cmake-2.8.8
>=sys-devel/gcc-4.9.0
app-arch/zip
-   media-gfx/nvidia-cg-toolkit
media-libs/freetype
sys-devel/gettext
virtual/pkgconfig

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/

2015-12-12 Thread Devan Franchini

commit: 362e44de9e120889948e31e2cc1fdbed728ec29f
Author: Devan Franchini  gentoo  org>
AuthorDate: Sat Dec 12 21:09:46 2015 +
Commit: Devan Franchini  gentoo  org>
CommitDate: Sat Dec 12 21:12:17 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=362e44de

games-emulation/dolphin: Adds updates to  ebuild, bug #561914

Removes a lot of outdated dependencies and adds a few newer ones.
Also adds various new USE flags.

Package-Manager: portage-2.2.24

 games-emulation/dolphin/dolphin-.ebuild | 71 +++--
 games-emulation/dolphin/metadata.xml|  4 ++
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/games-emulation/dolphin/dolphin-.ebuild 
b/games-emulation/dolphin/dolphin-.ebuild
index bd8bcdf..5b8f798 100644
--- a/games-emulation/dolphin/dolphin-.ebuild
+++ b/games-emulation/dolphin/dolphin-.ebuild
@@ -14,7 +14,7 @@ then
inherit git-r3
KEYWORDS=""
 else
-   SRC_URI="https://${PN}-emu.googlecode.com/files/${P}-src.zip;
+   SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> 
${P}.zip"
KEYWORDS="~amd64"
 fi
 
@@ -23,35 +23,61 @@ HOMEPAGE="https://www.dolphin-emu.org/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa ao bluetooth doc ffmpeg lto +lzo openal opengl openmp portaudio 
pulseaudio"
+IUSE="alsa ao bluetooth doc egl +evdev ffmpeg llvm log lto openal pch 
portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
 
 RDEPEND=">=media-libs/glew-1.10
>=media-libs/libsfml-2.1
-   >=net-libs/miniupnpc-1.8
+   >net-libs/enet-1.3.7
+   >=net-libs/mbedtls-2.1.1
+   sys-libs/glibc
sys-libs/readline:=
+   sys-libs/zlib
x11-libs/libXext
+   x11-libs/libXi
x11-libs/libXrandr
-   media-libs/libsdl2[haptic,joystick]
-   net-libs/polarssl[havege]
+   virtual/libusb:1
+   virtual/opengl
alsa? ( media-libs/alsa-lib )
ao? ( media-libs/libao )
bluetooth? ( net-wireless/bluez )
-   ffmpeg? ( virtual/ffmpeg
-   !!>=media-video/libav-10 )
-   lzo? ( dev-libs/lzo )
-   openal? ( media-libs/openal )
-   opengl? ( virtual/opengl )
+   egl? ( media-libs/mesa[egl] )
+   evdev? (
+   dev-libs/libevdev
+   virtual/udev
+   )
+   ffmpeg? (
+   virtual/ffmpeg
+   !!>=media-video/libav-10
+   )
+   llvm? ( sys-devel/llvm )
+   openal? (
+   media-libs/openal
+   media-libs/libsoundtouch
+   )
portaudio? ( media-libs/portaudio )
+   profile? ( dev-util/oprofile )
pulseaudio? ( media-sound/pulseaudio )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   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]
+   )
"
 DEPEND="${RDEPEND}
+   >=dev-util/cmake-2.8.8
+   >=sys-devel/gcc-4.9.0
app-arch/zip
media-gfx/nvidia-cg-toolkit
media-libs/freetype
-   media-libs/libsoundtouch
-   >net-libs/enet-1.3.7
-   >=sys-devel/gcc-4.9.0
-   x11-libs/wxGTK:${WX_GTK_VER}
+   sys-devel/gettext
+   virtual/pkgconfig
"
 
 pkg_pretend() {
@@ -80,6 +106,9 @@ src_prepare() {
if use !bluetooth; then
sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die
fi
+   if use !llvm; then
+   sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die
+   fi
if use !openal; then
sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die
fi
@@ -111,6 +140,10 @@ src_prepare() {
 
 src_configure() {
 
+   if use wxwidgets; then
+   need-wxwidgets unicode
+   fi
+
local mycmakeargs=(
"-DDOLPHIN_WC_REVISION=${PV}"
"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
@@ -119,8 +152,16 @@ src_configure() {
"-Dplugindir=$(games_get_libdir)/${PN}"
"-DUSE_SHARED_ENET=ON"
$( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS )
+   $( cmake-utils_use log FASTLOG )
+   $( cmake-utils_use profile OPROFILING )
+   $( cmake-utils_use_disable wxwidgets WX )
+   $( cmake-utils_use_enable evdev EVDEV )
$( cmake-utils_use_enable lto LTO )
-   $( cmake-utils_use openmp OPENMP )
+   $( cmake-utils_use_enable pch PCH )
+   $( cmake-utils_use_enable qt5 QT )
+   $( cmake-utils_use_enable sdl SDL )
+   $( cmake-utils_use_use egl EGL )
+   $( cmake-utils_use_use upnp UPNP )
)

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/files/, games-emulation/dolphin/

2015-12-11 Thread Devan Franchini

commit: 793914c32d038d8aba300c0be19418a2a0b85394
Author: Devan Franchini  gentoo  org>
AuthorDate: Sat Dec 12 04:57:24 2015 +
Commit: Devan Franchini  gentoo  org>
CommitDate: Sat Dec 12 04:58:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=793914c3

games-emulation/dolphin - Bumps to version 5.0

Package-Manager: portage-2.2.24

 games-emulation/dolphin/Manifest   |   1 +
 games-emulation/dolphin/dolphin-5.0.ebuild | 153 +
 .../files/dolphin-5.0-dynamic-llvm-detect.patch|  54 
 .../files/dolphin-5.0-miniupnpc-abi-14.patch   | 137 ++
 4 files changed, 345 insertions(+)

diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index e127728..7bdb097 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,2 +1,3 @@
 DIST dolphin-4.0.2.zip 28261421 SHA256 
f20c824ee83c3a495fd019747d2f8254477b94c135415b386142f89716d05d66 SHA512 
5b1931a133fd431b8f03f47c4c1cfe89f752de17f792e2729421df439564d15a8e35b17e82e31cef99230157de4aa16b2572b28ad67f23ca23c5492972df2938
 WHIRLPOOL 
48dcc47de02e6aa25e5318bc2564df1ab510210556e3e7c9442f405abd04879b8cff85afb5f1fa7a36364902a472f18bf5fa8da3a9db59b915d41d4e60f3b235
 DIST dolphin-4.0.zip 23439392 SHA256 
a698caf05f47a55c30e09d0aab053a412df683de2e139a6348156b03c502a0ec SHA512 
02e366c2fa95ab5f37b0a66b94a5b56a632ef81e13febd982d6385cfaf7fa3edb4364180d4b8312e82bc7b8f150d02cde10248996f6a12286a20d684024aca20
 WHIRLPOOL 
0cb7b28b91f4b7bf93c56f2dd31d080e7e0418fb53d9cc9093ca995d2c99a1fa7d5d82111e2c8db363e2b07384be39ec0062ab0252233f480b8e45e9304e
+DIST dolphin-5.0.zip 28317729 SHA256 
2b1003360d52baf12a1bcd4d75f379749b0fd4001948ec1a24d0539c37aae055 SHA512 
1b1c0dd6da4ba7e9ffe30499fae582b922c9bbd8b3d8159fbf9f4bfa1e744ef5b4c00a85d34f7cdd6e01efa32133f59b2a1f42cafc9d620f7fc7462c4ba73615
 WHIRLPOOL 
73cc25bafcb0d32592e8ad799b0a3d458cfa944ad15380a3b8f1cf27f3e024c314b08469a17f6d92edced95631bba38e39e1ccd625227c0520813abbd399e0f4

diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild 
b/games-emulation/dolphin/dolphin-5.0.ebuild
new file mode 100644
index 000..9ef670f
--- /dev/null
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit cmake-utils eutils pax-utils toolchain-funcs versionator wxwidgets 
games
+
+SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}-rc.zip -> ${P}.zip"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Gamecube and Wii game emulator"
+HOMEPAGE="https://www.dolphin-emu.org/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa ao bluetooth doc ffmpeg lto +lzo openal opengl openmp portaudio 
pulseaudio"
+
+S=${WORKDIR}/${P}-rc/
+RDEPEND=">=media-libs/glew-1.10
+   >=media-libs/libsfml-2.1
+   >=net-libs/miniupnpc-1.8
+   sys-libs/readline:=
+   x11-libs/libXext
+   x11-libs/libXrandr
+   media-libs/libsdl2[haptic,joystick]
+   net-libs/polarssl[havege]
+   alsa? ( media-libs/alsa-lib )
+   ao? ( media-libs/libao )
+   bluetooth? ( net-wireless/bluez )
+   ffmpeg? ( virtual/ffmpeg
+   !!>=media-video/libav-10 )
+   lzo? ( dev-libs/lzo )
+   openal? ( media-libs/openal )
+   opengl? ( virtual/opengl )
+   portaudio? ( media-libs/portaudio )
+   pulseaudio? ( media-sound/pulseaudio )
+   "
+DEPEND="${RDEPEND}
+   app-arch/zip
+   media-gfx/nvidia-cg-toolkit
+   media-libs/freetype
+   media-libs/libsoundtouch
+   >net-libs/enet-1.3.7
+   >=sys-devel/gcc-4.9.0
+   x11-libs/wxGTK:${WX_GTK_VER}
+   "
+
+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
+
+}
+
+src_prepare() {
+
+   epatch "${FILESDIR}"/"${P}"-dynamic-llvm-detect.patch
+   epatch "${FILESDIR}"/"${P}"-miniupnpc-abi-14.patch
+
+   # 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
+

88 matches

Mail list logo