commit: 6e841bdd3281ab0359947e7d9fd156538417e1bb Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri May 20 06:39:44 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri May 20 06:41:03 2022 +0000 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 <mgorny <AT> gentoo.org> games-emulation/dolphin/Manifest | 2 + ...in-9999.ebuild => dolphin-5.0_p20220520.ebuild} | 103 ++++++++++++--------- games-emulation/dolphin/dolphin-9999.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-9999.ebuild b/games-emulation/dolphin/dolphin-5.0_p20220520.ebuild similarity index 73% copy from games-emulation/dolphin/dolphin-9999.ebuild copy to games-emulation/dolphin/dolphin-5.0_p20220520.ebuild index c62f0305347a..582306b2f5a3 100644 --- a/games-emulation/dolphin/dolphin-9999.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=( - [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 + # please keep this list in CMakeLists.txt order + [Bochs_disasm]=LGPL-2.1+ [cpp-optparse]=MIT - # no support for for using system library - [glslang]=BSD [imgui]=MIT - - # not packaged, tiny header library - [rangeset]=ZLIB + [glslang]=BSD # 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 + + # FIXME: requires minizip-ng + #[minizip]=ZLIB + + [FreeSurround]=GPL-2+ [soundtouch]=LGPL-2.1+ - [cubeb]=ISC + + # FIXME: discord-rpc not packaged [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 - # This is a stripped-down mGBA for integrated GBA support [mGBA]=MPL-2.0 + + [picojson]=BSD-2 + [rangeset]=ZLIB + [gtest]= # (build-time only) ) src_prepare() { + if use mgba; then + rmdir Externals/mGBA/mgba || die + mv "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die + fi + cmake_src_prepare local s remove=() @@ -129,6 +140,9 @@ src_prepare() { sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die fi + # Allow regular minizip. + sed -i -e '/minizip/s:>=2[.]0[.]0::' CMakeLists.txt || die + # Remove dirty suffix: needed for netplay sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die } @@ -139,6 +153,7 @@ src_configure() { # not when ccache binary is present in system (automagic). -DCCACHE_BIN=CCACHE_BIN-NOTFOUND -DENABLE_ALSA=$(usex alsa) + -DENABLE_AUTOUPDATE=OFF -DENABLE_BLUEZ=$(usex bluetooth) -DENABLE_EVDEV=$(usex evdev) -DENCODE_FRAMEDUMPS=$(usex ffmpeg) diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index c62f0305347a..69da69fee18f 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.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,10 +11,16 @@ 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" fi @@ -22,24 +28,30 @@ 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=( - [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 + # please keep this list in CMakeLists.txt order + [Bochs_disasm]=LGPL-2.1+ [cpp-optparse]=MIT - # no support for for using system library - [glslang]=BSD [imgui]=MIT - - # not packaged, tiny header library - [rangeset]=ZLIB + [glslang]=BSD # 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 + + # FIXME: requires minizip-ng + #[minizip]=ZLIB + + [FreeSurround]=GPL-2+ [soundtouch]=LGPL-2.1+ - [cubeb]=ISC + + # FIXME: discord-rpc not packaged [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 - # This is a stripped-down mGBA for integrated GBA support [mGBA]=MPL-2.0 + + [picojson]=BSD-2 + [rangeset]=ZLIB + [gtest]= # (build-time only) ) src_prepare() { + if use mgba; then + rmdir Externals/mGBA/mgba || die + mv "${WORKDIR}/mgba-${MGBA_COMMIT}" Externals/mGBA/mgba || die + fi + cmake_src_prepare local s remove=() @@ -129,6 +140,9 @@ src_prepare() { sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die fi + # Allow regular minizip. + sed -i -e '/minizip/s:>=2[.]0[.]0::' CMakeLists.txt || die + # Remove dirty suffix: needed for netplay sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die } @@ -139,6 +153,7 @@ src_configure() { # not when ccache binary is present in system (automagic). -DCCACHE_BIN=CCACHE_BIN-NOTFOUND -DENABLE_ALSA=$(usex alsa) + -DENABLE_AUTOUPDATE=OFF -DENABLE_BLUEZ=$(usex bluetooth) -DENABLE_EVDEV=$(usex evdev) -DENCODE_FRAMEDUMPS=$(usex ffmpeg)
