* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/citra/
@ 2024-03-07 13:13 Viorel Munteanu
2024-03-07 13:24 ` [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
0 siblings, 1 reply; 16+ messages in thread
From: Viorel Munteanu @ 2024-03-07 13:13 UTC (permalink / raw
To: gentoo-commits
commit: 5e15c4eeed7577412bfd12e03a9b39edcada5df3
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 13:02:35 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 13:02:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5e15c4ee
games-emulation/citra: treeclean
Upstream shutdown.
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
games-emulation/citra/citra-9999.ebuild | 170 --------------------------------
games-emulation/citra/metadata.xml | 13 ---
2 files changed, 183 deletions(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
deleted file mode 100644
index b090f31b8a..0000000000
--- a/games-emulation/citra/citra-9999.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake git-r3 xdg
-
-DESCRIPTION="A Nintendo 3DS Emulator"
-HOMEPAGE="https://citra-emu.org"
-EGIT_REPO_URI="https://github.com/citra-emu/citra"
-EGIT_SUBMODULES=(
- 'catch2' 'dds-ktx' 'discord-rpc' 'dynarmic' 'library-headers' 'libyuv'
- 'lodepng' 'nihstro' 'sirit' 'soundtouch' 'vma' 'xbyak'
-)
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="cubeb nls openal +gui sdl +system-libfmt +telemetry"
-
-RDEPEND="
- cubeb? ( media-libs/cubeb )
- media-video/ffmpeg:=[fdk]
- gui? ( nls? ( dev-qt/qttools:6[linguist] )
- dev-qt/qtbase:6[widgets,gui,opengl,network]
- dev-qt/qtmultimedia:6 )
- sdl? (
- media-libs/libsdl2
- >=dev-libs/inih-52
- )
- system-libfmt? ( >=dev-libs/libfmt-9:= )
- >=dev-libs/openssl-1.1:=
- app-arch/zstd
- dev-libs/boost:=
- dev-libs/crypto++:=
- dev-libs/teakra
- net-libs/enet:1.3=
- virtual/libusb:1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-cpp/cpp-jwt
- dev-cpp/robin-map
- dev-util/spirv-headers
-"
-REQUIRED_USE="|| ( gui sdl )"
-
-src_unpack() {
- if ! use system-libfmt; then
- EGIT_SUBMODULES+=( 'fmt' )
- fi
- if use openal; then
- EGIT_SUBMODULES+=( 'openal-soft' )
- fi
- git-r3_src_unpack
-
- cp -a "${S}"/externals/xbyak "${S}"/externals/dynarmic/externals/ || die
-
- # Do not fetch via sources because this file always changes
- curl https://api.citra-emu.org/gamedb/ > "${S}"/compatibility_list.json
-}
-
-src_prepare() {
- # Dynarmic: ensure those are unbundled
- for ext in fmt robin-map; do
- rm -rf externals/dynarmic/externals/${ext} || die
- done
-
- # Do not care about submodules wanted one are already fetched
- sed -i -e '/check_submodules_present()/d' CMakeLists.txt || die
-
- # Unbundle inih
- sed -i -e '/inih/d' externals/CMakeLists.txt || die
- sed -i -e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(INIH REQUIRED INIReader)' \
- -e '/target_link_libraries/s/inih/${INIH_LIBRARIES}/' src/citra/CMakeLists.txt || die
- sed -i -e 's:inih/cpp/::' src/citra/config.cpp || die
-
- # Unbundle libfmt
- if use system-libfmt; then
- sed -i -e '/fmt/d' externals/CMakeLists.txt || die
- sed -i -e '/find_package(Threads/afind_package(fmt)' CMakeLists.txt || die
- else
- sed -i -e '/FMT_INSTALL/d' externals/dynarmic/externals/CMakeLists.txt || die
- fi
-
- # Unbundle teakra
- sed -i -e '/teakra/d' externals/CMakeLists.txt || die
-
- # Unbundle zstd
- sed -i -e 's:libzstd_static:${ZSTD_LIBRARIES}:' \
- -e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(ZSTD REQUIRED libzstd)' \
- src/common/CMakeLists.txt || die
- sed -i -e '/zstd/d' externals/CMakeLists.txt || die
-
- # Unbundle enet
- sed -i -e 's:enet:${ENET_LIBRARIES}:' \
- -e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(ENET REQUIRED libenet)' \
- src/network/CMakeLists.txt || die
- sed -i -e '/#include.*enet/{s/"/</;s/"/>/}' src/network/*cpp || die
- sed -i -e '/enet/d' externals/CMakeLists.txt || die
-
- # Unbundle crypto++
- sed -i -e 's:cryptopp:${CRYPTOPP_LIBRARIES}:' \
- -e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(CRYPTOPP REQUIRED libcryptopp)' \
- src/dedicated_room/CMakeLists.txt \
- src/core/CMakeLists.txt || die
- sed -i -e '/^# Crypto++/,/add_subdirectory(cryptopp-cmake)/d' externals/CMakeLists.txt || die
-
- # Unbundle cubeb
- sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die
- if use cubeb; then
- sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die
- fi
- # Unbundle cpp-jwt
- sed -i -e '/cpp-jwt/d' externals/CMakeLists.txt || die
- sed -i -e 's/ cpp-jwt/ ssl crypto/' src/web_service/CMakeLists.txt || die
-
- # Unbundle xbyak
- sed -i -e '/^install(/,/^)$/d' externals/xbyak/CMakeLists.txt || die
-
- # glslang
- sed -i -e '/^# glslang/,/(glslang)/d' externals/CMakeLists.txt || die
- sed -i -e 's:SPIRV/GlslangToSpv.h:glslang/&:' src/video_core/renderer_vulkan/vk_shader_util.cpp || die
- sed -i -e '/target_include_directories(vulkan-headers/d' externals/CMakeLists.txt || die
-
- # Do not install dynarmic
- sed -i -e '/^# Install/,$d' externals/dynarmic/CMakeLists.txt || die
-
- # Do not install zydis
- sed -i '/^install(FILES/,/^install(DIRECTORY/d' \
- externals/dynarmic/externals/zydis/CMakeLists.txt || die
- sed -i -e '/MCL_INSTALL/d' externals/dynarmic/externals/CMakeLists.txt || die
-
- # do not trigger flags
- sed -i -e 's/-Werror//' externals/sirit/CMakeLists.txt externals/dynarmic/CMakeLists.txt || die
- sed -i -e 's/Wuninitialized/Wno-uninitialized/' externals/catch2/CMake/CatchMiscFunctions.cmake \
- externals/dynarmic/externals/catch/CMake/CatchMiscFunctions.cmake || die
- sed -i -e '/-Werror/d' src/CMakeLists.txt externals/dynarmic/externals/mcl/CMakeLists.txt externals/dynarmic/externals/catch/CMake/CatchMiscFunctions.cmake externals/catch2/CMake/CatchMiscFunctions.cmake
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=OFF
- -DCOMPILE_WITH_DWARF=OFF
- -DENABLE_CUBEB=$(usex cubeb)
- -DENABLE_MF=ON
- -DENABLE_OPENAL=$(usex openal)
- -DENABLE_QT=$(usex gui)
- -DENABLE_QT_TRANSLATION=$(use gui && usex nls || echo OFF)
- -DENABLE_SDL2=$(usex sdl)
- -DENABLE_WEB_SERVICE=$(usex telemetry)
- -DGENERATE_QT_TRANSLATION=$(use gui && usex nls || echo OFF)
- -DSIRIT_USE_SYSTEM_SPIRV_HEADERS=ON
- -DUSE_SYSTEM_BOOST=ON
- -DUSE_SYSTEM_LIBUSB=ON
- -DUSE_SYSTEM_OPENSSL=ON
- -DUSE_SYSTEM_SDL2=ON
- )
- cmake_src_configure
-
- # This would be better in src_unpack but it would be unlinked
- mv "${S}"/compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die
-}
-
-src_install() {
- cmake_src_install
- rm -rf "${D}"/usr/$(get_libdir)/cmake
-}
diff --git a/games-emulation/citra/metadata.xml b/games-emulation/citra/metadata.xml
deleted file mode 100644
index 50f72750de..0000000000
--- a/games-emulation/citra/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
- <name>Samuel Bauer</name>
- <email>samuel.bauer@yahoo.fr</email>
-</maintainer>
-<use>
- <flag name="cubeb">Enables the cubeb audio backend</flag>
- <flag name="system-libfmt">Use system libfmt</flag>
- <flag name="telemetry">Enable web services (telemetry, etc.)</flag>
-</use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra/
2024-03-07 13:13 [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/citra/ Viorel Munteanu
@ 2024-03-07 13:24 ` Viorel Munteanu
0 siblings, 0 replies; 16+ messages in thread
From: Viorel Munteanu @ 2024-03-07 13:24 UTC (permalink / raw
To: gentoo-commits
commit: 5e15c4eeed7577412bfd12e03a9b39edcada5df3
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 13:02:35 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 13:02:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5e15c4ee
games-emulation/citra: treeclean
Upstream shutdown.
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
games-emulation/citra/citra-9999.ebuild | 170 --------------------------------
games-emulation/citra/metadata.xml | 13 ---
2 files changed, 183 deletions(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
deleted file mode 100644
index b090f31b8a..0000000000
--- a/games-emulation/citra/citra-9999.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake git-r3 xdg
-
-DESCRIPTION="A Nintendo 3DS Emulator"
-HOMEPAGE="https://citra-emu.org"
-EGIT_REPO_URI="https://github.com/citra-emu/citra"
-EGIT_SUBMODULES=(
- 'catch2' 'dds-ktx' 'discord-rpc' 'dynarmic' 'library-headers' 'libyuv'
- 'lodepng' 'nihstro' 'sirit' 'soundtouch' 'vma' 'xbyak'
-)
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="cubeb nls openal +gui sdl +system-libfmt +telemetry"
-
-RDEPEND="
- cubeb? ( media-libs/cubeb )
- media-video/ffmpeg:=[fdk]
- gui? ( nls? ( dev-qt/qttools:6[linguist] )
- dev-qt/qtbase:6[widgets,gui,opengl,network]
- dev-qt/qtmultimedia:6 )
- sdl? (
- media-libs/libsdl2
- >=dev-libs/inih-52
- )
- system-libfmt? ( >=dev-libs/libfmt-9:= )
- >=dev-libs/openssl-1.1:=
- app-arch/zstd
- dev-libs/boost:=
- dev-libs/crypto++:=
- dev-libs/teakra
- net-libs/enet:1.3=
- virtual/libusb:1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-cpp/cpp-jwt
- dev-cpp/robin-map
- dev-util/spirv-headers
-"
-REQUIRED_USE="|| ( gui sdl )"
-
-src_unpack() {
- if ! use system-libfmt; then
- EGIT_SUBMODULES+=( 'fmt' )
- fi
- if use openal; then
- EGIT_SUBMODULES+=( 'openal-soft' )
- fi
- git-r3_src_unpack
-
- cp -a "${S}"/externals/xbyak "${S}"/externals/dynarmic/externals/ || die
-
- # Do not fetch via sources because this file always changes
- curl https://api.citra-emu.org/gamedb/ > "${S}"/compatibility_list.json
-}
-
-src_prepare() {
- # Dynarmic: ensure those are unbundled
- for ext in fmt robin-map; do
- rm -rf externals/dynarmic/externals/${ext} || die
- done
-
- # Do not care about submodules wanted one are already fetched
- sed -i -e '/check_submodules_present()/d' CMakeLists.txt || die
-
- # Unbundle inih
- sed -i -e '/inih/d' externals/CMakeLists.txt || die
- sed -i -e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(INIH REQUIRED INIReader)' \
- -e '/target_link_libraries/s/inih/${INIH_LIBRARIES}/' src/citra/CMakeLists.txt || die
- sed -i -e 's:inih/cpp/::' src/citra/config.cpp || die
-
- # Unbundle libfmt
- if use system-libfmt; then
- sed -i -e '/fmt/d' externals/CMakeLists.txt || die
- sed -i -e '/find_package(Threads/afind_package(fmt)' CMakeLists.txt || die
- else
- sed -i -e '/FMT_INSTALL/d' externals/dynarmic/externals/CMakeLists.txt || die
- fi
-
- # Unbundle teakra
- sed -i -e '/teakra/d' externals/CMakeLists.txt || die
-
- # Unbundle zstd
- sed -i -e 's:libzstd_static:${ZSTD_LIBRARIES}:' \
- -e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(ZSTD REQUIRED libzstd)' \
- src/common/CMakeLists.txt || die
- sed -i -e '/zstd/d' externals/CMakeLists.txt || die
-
- # Unbundle enet
- sed -i -e 's:enet:${ENET_LIBRARIES}:' \
- -e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(ENET REQUIRED libenet)' \
- src/network/CMakeLists.txt || die
- sed -i -e '/#include.*enet/{s/"/</;s/"/>/}' src/network/*cpp || die
- sed -i -e '/enet/d' externals/CMakeLists.txt || die
-
- # Unbundle crypto++
- sed -i -e 's:cryptopp:${CRYPTOPP_LIBRARIES}:' \
- -e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(CRYPTOPP REQUIRED libcryptopp)' \
- src/dedicated_room/CMakeLists.txt \
- src/core/CMakeLists.txt || die
- sed -i -e '/^# Crypto++/,/add_subdirectory(cryptopp-cmake)/d' externals/CMakeLists.txt || die
-
- # Unbundle cubeb
- sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die
- if use cubeb; then
- sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die
- fi
- # Unbundle cpp-jwt
- sed -i -e '/cpp-jwt/d' externals/CMakeLists.txt || die
- sed -i -e 's/ cpp-jwt/ ssl crypto/' src/web_service/CMakeLists.txt || die
-
- # Unbundle xbyak
- sed -i -e '/^install(/,/^)$/d' externals/xbyak/CMakeLists.txt || die
-
- # glslang
- sed -i -e '/^# glslang/,/(glslang)/d' externals/CMakeLists.txt || die
- sed -i -e 's:SPIRV/GlslangToSpv.h:glslang/&:' src/video_core/renderer_vulkan/vk_shader_util.cpp || die
- sed -i -e '/target_include_directories(vulkan-headers/d' externals/CMakeLists.txt || die
-
- # Do not install dynarmic
- sed -i -e '/^# Install/,$d' externals/dynarmic/CMakeLists.txt || die
-
- # Do not install zydis
- sed -i '/^install(FILES/,/^install(DIRECTORY/d' \
- externals/dynarmic/externals/zydis/CMakeLists.txt || die
- sed -i -e '/MCL_INSTALL/d' externals/dynarmic/externals/CMakeLists.txt || die
-
- # do not trigger flags
- sed -i -e 's/-Werror//' externals/sirit/CMakeLists.txt externals/dynarmic/CMakeLists.txt || die
- sed -i -e 's/Wuninitialized/Wno-uninitialized/' externals/catch2/CMake/CatchMiscFunctions.cmake \
- externals/dynarmic/externals/catch/CMake/CatchMiscFunctions.cmake || die
- sed -i -e '/-Werror/d' src/CMakeLists.txt externals/dynarmic/externals/mcl/CMakeLists.txt externals/dynarmic/externals/catch/CMake/CatchMiscFunctions.cmake externals/catch2/CMake/CatchMiscFunctions.cmake
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=OFF
- -DCOMPILE_WITH_DWARF=OFF
- -DENABLE_CUBEB=$(usex cubeb)
- -DENABLE_MF=ON
- -DENABLE_OPENAL=$(usex openal)
- -DENABLE_QT=$(usex gui)
- -DENABLE_QT_TRANSLATION=$(use gui && usex nls || echo OFF)
- -DENABLE_SDL2=$(usex sdl)
- -DENABLE_WEB_SERVICE=$(usex telemetry)
- -DGENERATE_QT_TRANSLATION=$(use gui && usex nls || echo OFF)
- -DSIRIT_USE_SYSTEM_SPIRV_HEADERS=ON
- -DUSE_SYSTEM_BOOST=ON
- -DUSE_SYSTEM_LIBUSB=ON
- -DUSE_SYSTEM_OPENSSL=ON
- -DUSE_SYSTEM_SDL2=ON
- )
- cmake_src_configure
-
- # This would be better in src_unpack but it would be unlinked
- mv "${S}"/compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die
-}
-
-src_install() {
- cmake_src_install
- rm -rf "${D}"/usr/$(get_libdir)/cmake
-}
diff --git a/games-emulation/citra/metadata.xml b/games-emulation/citra/metadata.xml
deleted file mode 100644
index 50f72750de..0000000000
--- a/games-emulation/citra/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
- <name>Samuel Bauer</name>
- <email>samuel.bauer@yahoo.fr</email>
-</maintainer>
-<use>
- <flag name="cubeb">Enables the cubeb audio backend</flag>
- <flag name="system-libfmt">Use system libfmt</flag>
- <flag name="telemetry">Enable web services (telemetry, etc.)</flag>
-</use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra/
@ 2023-08-23 17:33 David Roman
0 siblings, 0 replies; 16+ messages in thread
From: David Roman @ 2023-08-23 17:33 UTC (permalink / raw
To: gentoo-commits
commit: b92ba1a6a46ad13dfa03f91febadd5e6d8dceaa8
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Aug 22 22:49:15 2023 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Aug 22 22:49:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b92ba1a6
games-emulation/citra: upstream fixed boost detection
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/citra/citra-9999.ebuild | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index a197c09e94..b090f31b8a 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
- dev-cpp/cpp-httplib
dev-cpp/cpp-jwt
dev-cpp/robin-map
dev-util/spirv-headers
@@ -76,13 +75,6 @@ src_prepare() {
-e '/target_link_libraries/s/inih/${INIH_LIBRARIES}/' src/citra/CMakeLists.txt || die
sed -i -e 's:inih/cpp/::' src/citra/config.cpp || die
- # Fix boost unbundling
- sed -i -e '/(-DBOOST_ERROR_CODE_HEADER_ONLY/,/)/d' CMakeLists.txt || die
- sed -i -e '/^# Boost/,/boost_iostreams PUBLIC/d' externals/CMakeLists.txt || die
- sed -i -e '/^#define BOOST_STACKTRACE_USE_BACKTRACE/d' \
- src/common/logging/backend.cpp || die
- sed -i -e 's/ backtrace//' src/common/CMakeLists.txt || die
-
# Unbundle libfmt
if use system-libfmt; then
sed -i -e '/fmt/d' externals/CMakeLists.txt || die
@@ -119,10 +111,6 @@ src_prepare() {
if use cubeb; then
sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die
fi
-
- # Unbundle cpp-httplib
- sed -i -e '/# httplib/,/target_link_libraries(httplib/d' externals/CMakeLists.txt || die
-
# Unbundle cpp-jwt
sed -i -e '/cpp-jwt/d' externals/CMakeLists.txt || die
sed -i -e 's/ cpp-jwt/ ssl crypto/' src/web_service/CMakeLists.txt || die
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra/
@ 2023-07-27 12:04 David Roman
0 siblings, 0 replies; 16+ messages in thread
From: David Roman @ 2023-07-27 12:04 UTC (permalink / raw
To: gentoo-commits
commit: c7a8d9624687f47f1625ea164e233005a37414e6
Author: YiFei Zhu <zhuyifei1999 <AT> gmail <DOT> com>
AuthorDate: Wed Jul 26 19:01:44 2023 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Jul 26 19:02:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c7a8d962
Revert "games-emulation/citra: Add dev-util/spirv-headers as a build dependency"
This reverts commit 60b0687f417795d77547e7342c8a1b568c274e11.
I forgot to add closes tag.
Signed-off-by: YiFei Zhu <zhuyifei1999 <AT> gmail.com>
games-emulation/citra/citra-9999.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index a197c09e94..3c78946d39 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -41,9 +41,7 @@ DEPEND="${RDEPEND}"
BDEPEND="
dev-cpp/cpp-httplib
dev-cpp/cpp-jwt
- dev-cpp/robin-map
- dev-util/spirv-headers
-"
+ dev-cpp/robin-map"
REQUIRED_USE="|| ( gui sdl )"
src_unpack() {
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra/
@ 2023-07-27 12:04 David Roman
0 siblings, 0 replies; 16+ messages in thread
From: David Roman @ 2023-07-27 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 6f221f20c98acf404447dd6957755df13860a8da
Author: Sebastian France <MagelessMayhem <AT> protonmail <DOT> com>
AuthorDate: Tue Jul 25 19:02:03 2023 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Jul 26 19:03:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6f221f20
games-emulation/citra: Add dev-util/spirv-headers as a build dependency
Signed-off-by: Sebastian France <MagelessMayhem <AT> protonmail.com>
Closes: https://github.com/gentoo/guru/pull/101
Signed-off-by: YiFei Zhu <zhuyifei1999 <AT> gmail.com>
games-emulation/citra/citra-9999.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index 3c78946d39..a197c09e94 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -41,7 +41,9 @@ DEPEND="${RDEPEND}"
BDEPEND="
dev-cpp/cpp-httplib
dev-cpp/cpp-jwt
- dev-cpp/robin-map"
+ dev-cpp/robin-map
+ dev-util/spirv-headers
+"
REQUIRED_USE="|| ( gui sdl )"
src_unpack() {
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra/
@ 2023-07-27 12:04 David Roman
0 siblings, 0 replies; 16+ messages in thread
From: David Roman @ 2023-07-27 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 60b0687f417795d77547e7342c8a1b568c274e11
Author: Sebastian France <MagelessMayhem <AT> protonmail <DOT> com>
AuthorDate: Tue Jul 25 19:02:03 2023 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Jul 26 19:00:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=60b0687f
games-emulation/citra: Add dev-util/spirv-headers as a build dependency
Signed-off-by: Sebastian France <MagelessMayhem <AT> protonmail.com>
Signed-off-by: YiFei Zhu <zhuyifei1999 <AT> gmail.com>
games-emulation/citra/citra-9999.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index 3c78946d39..a197c09e94 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -41,7 +41,9 @@ DEPEND="${RDEPEND}"
BDEPEND="
dev-cpp/cpp-httplib
dev-cpp/cpp-jwt
- dev-cpp/robin-map"
+ dev-cpp/robin-map
+ dev-util/spirv-headers
+"
REQUIRED_USE="|| ( gui sdl )"
src_unpack() {
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra/
@ 2023-07-13 9:42 David Roman
0 siblings, 0 replies; 16+ messages in thread
From: David Roman @ 2023-07-13 9:42 UTC (permalink / raw
To: gentoo-commits
commit: ea9dcb07de341f6a6ebed1c1815d50f58ea48d45
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Thu Jul 13 06:45:10 2023 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Jul 13 06:45:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ea9dcb07
games-emulation/citra: depend on qt6
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/citra/citra-9999.ebuild | 81 +++++++++++++++++++--------------
games-emulation/citra/metadata.xml | 2 -
2 files changed, 46 insertions(+), 37 deletions(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index 819b844f6..3c78946d3 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -9,31 +9,26 @@ DESCRIPTION="A Nintendo 3DS Emulator"
HOMEPAGE="https://citra-emu.org"
EGIT_REPO_URI="https://github.com/citra-emu/citra"
EGIT_SUBMODULES=(
- 'catch2' 'discord-rpc' 'dynarmic' 'libyuv'
- 'lodepng' 'nihstro' 'soundtouch' 'xbyak'
+ 'catch2' 'dds-ktx' 'discord-rpc' 'dynarmic' 'library-headers' 'libyuv'
+ 'lodepng' 'nihstro' 'sirit' 'soundtouch' 'vma' 'xbyak'
)
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="cubeb +hle-sound nls +qt5 sdl +system-libfmt +telemetry video"
+IUSE="cubeb nls openal +gui sdl +system-libfmt +telemetry"
RDEPEND="
cubeb? ( media-libs/cubeb )
- !hle-sound? ( media-libs/fdk-aac )
- hle-sound? ( media-video/ffmpeg[fdk] )
- qt5? ( nls? ( dev-qt/linguist )
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5 )
+ media-video/ffmpeg:=[fdk]
+ gui? ( nls? ( dev-qt/qttools:6[linguist] )
+ dev-qt/qtbase:6[widgets,gui,opengl,network]
+ dev-qt/qtmultimedia:6 )
sdl? (
media-libs/libsdl2
>=dev-libs/inih-52
)
system-libfmt? ( >=dev-libs/libfmt-9:= )
- video? ( media-video/ffmpeg:= )
>=dev-libs/openssl-1.1:=
app-arch/zstd
dev-libs/boost:=
@@ -47,12 +42,15 @@ BDEPEND="
dev-cpp/cpp-httplib
dev-cpp/cpp-jwt
dev-cpp/robin-map"
-REQUIRED_USE="|| ( qt5 sdl )"
+REQUIRED_USE="|| ( gui sdl )"
src_unpack() {
if ! use system-libfmt; then
EGIT_SUBMODULES+=( 'fmt' )
fi
+ if use openal; then
+ EGIT_SUBMODULES+=( 'openal-soft' )
+ fi
git-r3_src_unpack
cp -a "${S}"/externals/xbyak "${S}"/externals/dynarmic/externals/ || die
@@ -78,24 +76,17 @@ src_prepare() {
# Fix boost unbundling
sed -i -e '/(-DBOOST_ERROR_CODE_HEADER_ONLY/,/)/d' CMakeLists.txt || die
- sed -i -e '/^# Boost/,/boost)$/d' externals/CMakeLists.txt || die
-
- # Unbundle libressl (TODO rework scopes, find_package(OpenSSL is called 5 times)
- sed -i -e '$afind_package(OpenSSL 1.1)\nset(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto PARENT_SCOPE)' \
- CMakeLists.txt || die
- sed -i -e 's/# LibreSSL/find_package(OpenSSL 1.1)\nif (NOT OPENSSL_FOUND)\n/' \
- -e 's/-DHAVE_INET_NTOP)$/&\nendif()\n/' externals/CMakeLists.txt || die
- sed -i -e '/get_directory_property(OPENSSL_LIBS/,/)/d' \
- -e 's/OPENSSL_LIBS/OPENSSL_LIBRARIES/' \
- src/web_service/CMakeLists.txt \
- src/core/CMakeLists.txt || die
- sed -i -e 's/{PLATFORM_LIBRARIES}/& OpenSSL::SSL OpenSSL::Crypto/' \
- src/{citra,citra_qt,dedicated_room,tests}/CMakeLists.txt || die
- sed -i -e '1ifind_package(OpenSSL 1.1)' src/{citra,citra_qt,dedicated_room,tests}/CMakeLists.txt || die
+ sed -i -e '/^# Boost/,/boost_iostreams PUBLIC/d' externals/CMakeLists.txt || die
+ sed -i -e '/^#define BOOST_STACKTRACE_USE_BACKTRACE/d' \
+ src/common/logging/backend.cpp || die
+ sed -i -e 's/ backtrace//' src/common/CMakeLists.txt || die
- if use system-libfmt; then # Unbundle libfmt
+ # Unbundle libfmt
+ if use system-libfmt; then
sed -i -e '/fmt/d' externals/CMakeLists.txt || die
sed -i -e '/find_package(Threads/afind_package(fmt)' CMakeLists.txt || die
+ else
+ sed -i -e '/FMT_INSTALL/d' externals/dynarmic/externals/CMakeLists.txt || die
fi
# Unbundle teakra
@@ -119,7 +110,7 @@ src_prepare() {
-e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(CRYPTOPP REQUIRED libcryptopp)' \
src/dedicated_room/CMakeLists.txt \
src/core/CMakeLists.txt || die
- sed -i -e '/^# Crypto++/,/set(CRYPTOPP_COMPILE_DEFINITIONS/d' externals/CMakeLists.txt || die
+ sed -i -e '/^# Crypto++/,/add_subdirectory(cryptopp-cmake)/d' externals/CMakeLists.txt || die
# Unbundle cubeb
sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die
@@ -131,30 +122,50 @@ src_prepare() {
sed -i -e '/# httplib/,/target_link_libraries(httplib/d' externals/CMakeLists.txt || die
# Unbundle cpp-jwt
- sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die
+ sed -i -e '/cpp-jwt/d' externals/CMakeLists.txt || die
sed -i -e 's/ cpp-jwt/ ssl crypto/' src/web_service/CMakeLists.txt || die
# Unbundle xbyak
sed -i -e '/^install(/,/^)$/d' externals/xbyak/CMakeLists.txt || die
+ # glslang
+ sed -i -e '/^# glslang/,/(glslang)/d' externals/CMakeLists.txt || die
+ sed -i -e 's:SPIRV/GlslangToSpv.h:glslang/&:' src/video_core/renderer_vulkan/vk_shader_util.cpp || die
+ sed -i -e '/target_include_directories(vulkan-headers/d' externals/CMakeLists.txt || die
+
# Do not install dynarmic
sed -i -e '/^# Install/,$d' externals/dynarmic/CMakeLists.txt || die
+ # Do not install zydis
+ sed -i '/^install(FILES/,/^install(DIRECTORY/d' \
+ externals/dynarmic/externals/zydis/CMakeLists.txt || die
+ sed -i -e '/MCL_INSTALL/d' externals/dynarmic/externals/CMakeLists.txt || die
+
+ # do not trigger flags
+ sed -i -e 's/-Werror//' externals/sirit/CMakeLists.txt externals/dynarmic/CMakeLists.txt || die
+ sed -i -e 's/Wuninitialized/Wno-uninitialized/' externals/catch2/CMake/CatchMiscFunctions.cmake \
+ externals/dynarmic/externals/catch/CMake/CatchMiscFunctions.cmake || die
+ sed -i -e '/-Werror/d' src/CMakeLists.txt externals/dynarmic/externals/mcl/CMakeLists.txt externals/dynarmic/externals/catch/CMake/CatchMiscFunctions.cmake externals/catch2/CMake/CatchMiscFunctions.cmake
+
cmake_src_prepare
}
src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=OFF
+ -DCOMPILE_WITH_DWARF=OFF
-DENABLE_CUBEB=$(usex cubeb)
- -DENABLE_FFMPEG_AUDIO_DECODER=$(usex hle-sound)
- -DENABLE_FFMPEG_VIDEO_DUMPER=$(usex video)
- -DENABLE_QT=$(usex qt5)
- -DENABLE_QT_TRANSLATION=$(use qt5 && usex nls || echo OFF)
+ -DENABLE_MF=ON
+ -DENABLE_OPENAL=$(usex openal)
+ -DENABLE_QT=$(usex gui)
+ -DENABLE_QT_TRANSLATION=$(use gui && usex nls || echo OFF)
-DENABLE_SDL2=$(usex sdl)
-DENABLE_WEB_SERVICE=$(usex telemetry)
- -DGENERATE_QT_TRANSLATION=$(use qt5 && usex nls || echo OFF)
+ -DGENERATE_QT_TRANSLATION=$(use gui && usex nls || echo OFF)
+ -DSIRIT_USE_SYSTEM_SPIRV_HEADERS=ON
-DUSE_SYSTEM_BOOST=ON
+ -DUSE_SYSTEM_LIBUSB=ON
+ -DUSE_SYSTEM_OPENSSL=ON
-DUSE_SYSTEM_SDL2=ON
)
cmake_src_configure
diff --git a/games-emulation/citra/metadata.xml b/games-emulation/citra/metadata.xml
index b1b0ebcf7..50f72750d 100644
--- a/games-emulation/citra/metadata.xml
+++ b/games-emulation/citra/metadata.xml
@@ -7,9 +7,7 @@
</maintainer>
<use>
<flag name="cubeb">Enables the cubeb audio backend</flag>
- <flag name="hle-sound">Enable HLE sound via FFmpeg audio (AAC) decoder</flag>
<flag name="system-libfmt">Use system libfmt</flag>
<flag name="telemetry">Enable web services (telemetry, etc.)</flag>
- <flag name="video">Enable FFmpeg video dumper</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra/
@ 2022-09-27 20:43 Haelwenn Monnier
0 siblings, 0 replies; 16+ messages in thread
From: Haelwenn Monnier @ 2022-09-27 20:43 UTC (permalink / raw
To: gentoo-commits
commit: d0f5a28c627b5f533d99e7a86096910367e8010a
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Sep 27 17:17:03 2022 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Tue Sep 27 17:18:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d0f5a28c
games-emulation/citra: do not unbundle catch
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/citra/citra-9999.ebuild | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index 2473246b9..fe1319afe 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A Nintendo 3DS Emulator"
HOMEPAGE="https://citra-emu.org"
EGIT_REPO_URI="https://github.com/citra-emu/citra"
EGIT_SUBMODULES=(
- 'catch2' 'discord-rpc' 'dynarmic' 'fmt' 'libyuv'
+ 'catch2' 'discord-rpc' 'dynarmic' 'libyuv'
'lodepng' 'nihstro' 'soundtouch' 'xbyak'
)
@@ -36,22 +36,21 @@ RDEPEND="
video? ( media-video/ffmpeg:= )
>=dev-libs/openssl-1.1:=
app-arch/zstd
- dev-cpp/catch:0
dev-libs/boost:=
dev-libs/crypto++:=
dev-libs/teakra
net-libs/enet:1.3=
virtual/libusb:1
"
-DEPEND="${RDEPEND}
- dev-cpp/cpp-httplib
+DEPEND="${RDEPEND}"
+BDEPEND="dev-cpp/cpp-httplib
dev-cpp/cpp-jwt
dev-cpp/robin-map"
REQUIRED_USE="|| ( qt5 sdl )"
src_unpack() {
- if use system-libfmt; then
- EGIT_SUBMODULES+=( '-fmt' )
+ if ! use system-libfmt; then
+ EGIT_SUBMODULES+=( 'fmt' )
fi
git-r3_src_unpack
@@ -63,7 +62,7 @@ src_unpack() {
src_prepare() {
# Dynarmic: ensure those are unbundled
- for ext in fmt catch robin-map; do
+ for ext in fmt robin-map; do
rm -rf externals/dynarmic/externals/${ext} || die
done
@@ -124,8 +123,6 @@ src_prepare() {
src/core/CMakeLists.txt || die
sed -i -e '/cryptopp/d' externals/CMakeLists.txt || die
- # Unbundle catch -- Wait for catch>=3
-
# Unbundle cubeb
sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die
if use cubeb; then
@@ -140,7 +137,6 @@ src_prepare() {
sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die
sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die
- # TODO unbundle xbyak (wait for 5.96 in ytree)
cmake_src_prepare
}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra/
@ 2022-09-27 20:43 Haelwenn Monnier
0 siblings, 0 replies; 16+ messages in thread
From: Haelwenn Monnier @ 2022-09-27 20:43 UTC (permalink / raw
To: gentoo-commits
commit: 763fa17b42a831580139f4f5cba5fb7ee3298aad
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Sep 27 17:34:03 2022 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Tue Sep 27 17:34:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=763fa17b
games-emulation/citra: put back header only in DEPEND
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/citra/citra-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index fe1319afe..2bf048892 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -42,8 +42,8 @@ RDEPEND="
net-libs/enet:1.3=
virtual/libusb:1
"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-cpp/cpp-httplib
+DEPEND="${RDEPEND}
+ dev-cpp/cpp-httplib
dev-cpp/cpp-jwt
dev-cpp/robin-map"
REQUIRED_USE="|| ( qt5 sdl )"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra/
@ 2022-09-27 20:43 Haelwenn Monnier
0 siblings, 0 replies; 16+ messages in thread
From: Haelwenn Monnier @ 2022-09-27 20:43 UTC (permalink / raw
To: gentoo-commits
commit: fab5f7a3a1447fe76dec532b02aab76382129ec9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 17:11:12 2022 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Tue Sep 27 17:11:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fab5f7a3
games-emulation/citra: drop obsolete SDL2 sed
Fixed upstream in https://github.com/citra-emu/citra/commit/b5872ea79e0c2f71c1e1ddf908b5feba3d0f68c2.
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-emulation/citra/citra-9999.ebuild | 3 ---
1 file changed, 3 deletions(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index 58fda2f5a..2473246b9 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -140,9 +140,6 @@ src_prepare() {
sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die
sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die
- # Alias for sdl
- sed -i -e '/find_package(SDL2/aadd_library(SDL2 INTERFACE)\ntarget_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")\ntarget_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")\nadd_library(SDL2::SDL2 ALIAS SDL2)\n' CMakeLists.txt || die
-
# TODO unbundle xbyak (wait for 5.96 in ytree)
cmake_src_prepare
}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra/
@ 2022-09-26 9:48 Andrew Ammerlaan
0 siblings, 0 replies; 16+ messages in thread
From: Andrew Ammerlaan @ 2022-09-26 9:48 UTC (permalink / raw
To: gentoo-commits
commit: 49e1aaf7381546316aa97e80be918015c38489b6
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Sep 23 05:08:16 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 05:08:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=49e1aaf7
citra-9999.ebuild
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/citra/citra-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index 4f7d825b2..58fda2f5a 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -141,7 +141,6 @@ src_prepare() {
sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die
# Alias for sdl
- #sed -i -e '/find_package(SDL2/aadd_library(SDL2::SDL2 ALIAS SDL2)' CMakeLists.txt || die
sed -i -e '/find_package(SDL2/aadd_library(SDL2 INTERFACE)\ntarget_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")\ntarget_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")\nadd_library(SDL2::SDL2 ALIAS SDL2)\n' CMakeLists.txt || die
# TODO unbundle xbyak (wait for 5.96 in ytree)
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra/
@ 2022-09-26 9:48 Andrew Ammerlaan
0 siblings, 0 replies; 16+ messages in thread
From: Andrew Ammerlaan @ 2022-09-26 9:48 UTC (permalink / raw
To: gentoo-commits
commit: bf6f782336f42305c3410009e9801d097595cb19
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Sep 23 04:20:32 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 04:20:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bf6f7823
games-emulation/citra: updates
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/citra/citra-9999.ebuild | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index d5e0f2d1b..4f7d825b2 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A Nintendo 3DS Emulator"
HOMEPAGE="https://citra-emu.org"
EGIT_REPO_URI="https://github.com/citra-emu/citra"
EGIT_SUBMODULES=(
- 'discord-rpc' 'dynarmic' 'libyuv'
+ 'catch2' 'discord-rpc' 'dynarmic' 'fmt' 'libyuv'
'lodepng' 'nihstro' 'soundtouch' 'xbyak'
)
@@ -18,7 +18,7 @@ SLOT="0"
KEYWORDS=""
IUSE="cubeb +hle-sound nls +qt5 sdl system-libfmt +telemetry video"
-DEPEND="
+RDEPEND="
cubeb? ( media-libs/cubeb )
!hle-sound? ( media-libs/fdk-aac )
hle-sound? ( media-video/ffmpeg[fdk] )
@@ -43,13 +43,15 @@ DEPEND="
net-libs/enet:1.3=
virtual/libusb:1
"
-RDEPEND="${DEPEND}
+DEPEND="${RDEPEND}
+ dev-cpp/cpp-httplib
+ dev-cpp/cpp-jwt
dev-cpp/robin-map"
REQUIRED_USE="|| ( qt5 sdl )"
src_unpack() {
- if ! use system-libfmt; then
- EGIT_SUBMODULES+=( 'fmt' )
+ if use system-libfmt; then
+ EGIT_SUBMODULES+=( '-fmt' )
fi
git-r3_src_unpack
@@ -122,12 +124,7 @@ src_prepare() {
src/core/CMakeLists.txt || die
sed -i -e '/cryptopp/d' externals/CMakeLists.txt || die
- # Unbundle catch
- sed -i -e '1ifind_package(Catch2)' src/tests/CMakeLists.txt externals/dynarmic/tests/CMakeLists.txt || die
- sed -i -e '/target_link_libraries/s/catch/Catch2::Catch2/' externals/dynarmic/tests/CMakeLists.txt || die
- sed -i -e '/target_link_libraries/s/catch-single-include/Catch2::Catch2/' src/tests/CMakeLists.txt || die
- sed -i -e '/catch/d' externals/CMakeLists.txt externals/dynarmic/externals/CMakeLists.txt || die
- grep -rl 'include <catch.hpp>' externals/dynarmic | xargs sed -i -e '/include/s:catch.hpp:catch/&:' || die
+ # Unbundle catch -- Wait for catch>=3
# Unbundle cubeb
sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die
@@ -135,6 +132,18 @@ src_prepare() {
sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die
fi
+ # Unbundle cpp-httplib
+ sed -i -e '/# httplib/,/target_link_libraries(httplib/d' externals/CMakeLists.txt || die
+ sed -i -e 's/ httplib//' src/{web_service,network,core}/CMakeLists.txt || die
+
+ # Unbundle cpp-jwt
+ sed -i -e '/# cpp-jwt/,/CPP_JWT_USE_VENDORED_NLOHMANN_JSON/d' externals/CMakeLists.txt || die
+ sed -i -e 's/ cpp-jwt//' src/web_service/CMakeLists.txt || die
+
+ # Alias for sdl
+ #sed -i -e '/find_package(SDL2/aadd_library(SDL2::SDL2 ALIAS SDL2)' CMakeLists.txt || die
+ sed -i -e '/find_package(SDL2/aadd_library(SDL2 INTERFACE)\ntarget_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")\ntarget_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")\nadd_library(SDL2::SDL2 ALIAS SDL2)\n' CMakeLists.txt || die
+
# TODO unbundle xbyak (wait for 5.96 in ytree)
cmake_src_prepare
}
@@ -151,6 +160,7 @@ src_configure() {
-DENABLE_WEB_SERVICE=$(usex telemetry)
-DGENERATE_QT_TRANSLATION=$(use qt5 && usex nls || echo OFF)
-DUSE_SYSTEM_BOOST=ON
+ -DUSE_SYSTEM_SDL2=ON
)
cmake_src_configure
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra/
@ 2022-09-09 20:02 Ronny Gutbrod
0 siblings, 0 replies; 16+ messages in thread
From: Ronny Gutbrod @ 2022-09-09 20:02 UTC (permalink / raw
To: gentoo-commits
commit: bce80b9eefda637767ac3b6f5707107e7b5fa6e4
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Sep 9 13:58:08 2022 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Fri Sep 9 13:58:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bce80b9e
games-emulation/citra: submodule whitelist instead of blacklist
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/citra/citra-9999.ebuild | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index 747eb426f..d5e0f2d1b 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -8,11 +8,9 @@ inherit cmake git-r3 xdg
DESCRIPTION="A Nintendo 3DS Emulator"
HOMEPAGE="https://citra-emu.org"
EGIT_REPO_URI="https://github.com/citra-emu/citra"
-EGIT_SUBMODULES=( '*'
- '-boost' '-catch' '-cryptopp' '-cubeb' '-enet'
- '-inih' '-libressl' '-libusb' '-teakra' '-zstd'
- '-externals/dynarmic/externals/fmt'
- '-externals/dynarmic/externals/xbyak'
+EGIT_SUBMODULES=(
+ 'discord-rpc' 'dynarmic' 'libyuv'
+ 'lodepng' 'nihstro' 'soundtouch' 'xbyak'
)
LICENSE="GPL-2"
@@ -34,24 +32,24 @@ DEPEND="
media-libs/libsdl2
>=dev-libs/inih-52
)
- system-libfmt? ( <=dev-libs/libfmt-8 )
- video? ( media-video/ffmpeg )
- >=dev-libs/openssl-1.1
+ system-libfmt? ( <=dev-libs/libfmt-8:= )
+ video? ( media-video/ffmpeg:= )
+ >=dev-libs/openssl-1.1:=
app-arch/zstd
dev-cpp/catch:0
- dev-cpp/robin-map
dev-libs/boost:=
- dev-libs/crypto++
+ dev-libs/crypto++:=
dev-libs/teakra
- net-libs/enet:1.3
+ net-libs/enet:1.3=
virtual/libusb:1
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ dev-cpp/robin-map"
REQUIRED_USE="|| ( qt5 sdl )"
src_unpack() {
- if use system-libfmt; then
- EGIT_SUBMODULES+=( "-fmt" "-externals/dynarmic/externals/fmt" )
+ if ! use system-libfmt; then
+ EGIT_SUBMODULES+=( 'fmt' )
fi
git-r3_src_unpack
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra/
@ 2022-05-23 17:15 Haelwenn Monnier
0 siblings, 0 replies; 16+ messages in thread
From: Haelwenn Monnier @ 2022-05-23 17:15 UTC (permalink / raw
To: gentoo-commits
commit: 9c2e2c9937eb8917976335e459fd92ebef679c81
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sun May 22 05:02:35 2022 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Sun May 22 05:02:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9c2e2c99
games-emulation/citra: add system-libfmt flag
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/citra/citra-9999.ebuild | 34 ++++++++++++++++++---------------
games-emulation/citra/metadata.xml | 1 +
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index b2e44375e..6e70e19e2 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://citra-emu.org"
EGIT_REPO_URI="https://github.com/citra-emu/citra"
EGIT_SUBMODULES=( '*'
'-boost' '-catch' '-cryptopp' '-cubeb' '-enet'
- '-fmt' '-inih' '-libressl' '-libusb' '-zstd'
+ '-inih' '-libressl' '-libusb' '-zstd'
'-externals/dynarmic/externals/fmt'
'-externals/dynarmic/externals/xbyak'
)
@@ -18,25 +18,25 @@ EGIT_SUBMODULES=( '*'
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="cubeb +hle-sound nls +qt5 sdl +telemetry video"
+IUSE="cubeb +hle-sound nls +qt5 sdl system-libfmt +telemetry video"
DEPEND="
cubeb? ( media-libs/cubeb )
!hle-sound? ( media-libs/fdk-aac )
hle-sound? ( media-video/ffmpeg[fdk] )
qt5? ( nls? ( dev-qt/linguist )
- dev-qt/qtgui
- dev-qt/qtmultimedia
- dev-qt/qtnetwork
- dev-qt/qtopengl
- dev-qt/qtwidgets )
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5 )
sdl? (
media-libs/libsdl2
>=dev-libs/inih-52
)
+ system-libfmt? ( <=dev-libs/libfmt-8 )
video? ( media-video/ffmpeg )
>=app-arch/zstd-1.4.8
- >=dev-libs/libfmt-8
>=dev-libs/openssl-1.1
dev-cpp/catch:0
dev-cpp/robin-map
@@ -49,6 +49,9 @@ RDEPEND="${DEPEND}"
REQUIRED_USE="|| ( qt5 sdl )"
src_unpack() {
+ if use system-libfmt; then
+ EGIT_SUBMODULES+=( "-fmt" "-externals/dynarmic/externals/fmt" )
+ fi
git-r3_src_unpack
cp -a "${S}"/externals/xbyak "${S}"/externals/dynarmic/externals/ || die
@@ -89,12 +92,13 @@ src_prepare() {
src/{citra,citra_qt,dedicated_room,tests}/CMakeLists.txt || die
sed -i -e '1ifind_package(OpenSSL 1.1)' src/{citra,citra_qt,dedicated_room,tests}/CMakeLists.txt || die
- # Unbundle libfmt
- sed -i -e '/fmt/d' externals/CMakeLists.txt || die
- sed -i -e 's/fmt/&::&/' -e '1ifind_package(fmt)' \
- src/{core,citra,citra_qt,dedicated_room,input_common,tests,video_core}/CMakeLists.txt || die
- sed -i -e '1ifind_package(fmt)' externals/dynarmic/src/CMakeLists.txt || die
- sed -i -e '/^#pragma once$/a#include <algorithm>' src/common/logging/log.h || die
+ if use system-libfmt; then # Unbundle libfmt
+ sed -i -e '/fmt/d' externals/CMakeLists.txt || die
+ sed -i -e 's/fmt/&::&/' -e '1ifind_package(fmt)' \
+ src/{core,citra,citra_qt,dedicated_room,input_common,tests,video_core}/CMakeLists.txt || die
+ sed -i -e '1ifind_package(fmt)' externals/dynarmic/src/CMakeLists.txt || die
+ sed -i -e '/^#pragma once$/a#include <algorithm>' src/common/logging/log.h || die
+ fi
# Unbundle zstd
sed -i -e 's:libzstd_static:${ZSTD_LIBRARIES}:' \
@@ -126,7 +130,7 @@ src_prepare() {
# Unbundle cubeb
sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die
if use cubeb; then
- sed -i -e '$afind_package(cubeb REQUIRED)\n'
+ sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die
fi
# TODO unbundle xbyak (wait for 5.96 in ytree)
diff --git a/games-emulation/citra/metadata.xml b/games-emulation/citra/metadata.xml
index acd89943b..87cb3dfdc 100644
--- a/games-emulation/citra/metadata.xml
+++ b/games-emulation/citra/metadata.xml
@@ -8,6 +8,7 @@
<use>
<flag name="cubeb">Enables the cubeb audio backend</flag>
<flag name="hle-sound">Enable HLE sound via FFmpeg audio (AAC) decoder</flag>
+ <flag name="system-libfmt">Use system libfmt</flag>
<flag name="telemetry">Enable web services (telemetry, etc.)</flag>
<flag name="video">Enable FFmpeg video dumper</flag>
</use>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra/
@ 2022-01-21 9:14 Florian Schmaus
0 siblings, 0 replies; 16+ messages in thread
From: Florian Schmaus @ 2022-01-21 9:14 UTC (permalink / raw
To: gentoo-commits
commit: 9bb6cd8cb6431aaa98a883a0e672daaad5259a51
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Jan 21 03:39:08 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 03:42:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9bb6cd8c
games-emulation/citra: rework submodules and dependencies. always use system libfmt
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/citra/citra-9999.ebuild | 33 +++++++++++++++++++++------------
games-emulation/citra/metadata.xml | 1 -
2 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index 602d34179..b2e44375e 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -8,12 +8,17 @@ inherit cmake git-r3 xdg
DESCRIPTION="A Nintendo 3DS Emulator"
HOMEPAGE="https://citra-emu.org"
EGIT_REPO_URI="https://github.com/citra-emu/citra"
-EGIT_SUBMODULES=( "*" "-boost" "-catch" "-cryptopp" "-enet" "-inih" "-libressl" "-externals/dynarmic/externals/xbyak" "-zstd" )
+EGIT_SUBMODULES=( '*'
+ '-boost' '-catch' '-cryptopp' '-cubeb' '-enet'
+ '-fmt' '-inih' '-libressl' '-libusb' '-zstd'
+ '-externals/dynarmic/externals/fmt'
+ '-externals/dynarmic/externals/xbyak'
+)
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="cubeb +hle-sound nls +qt5 sdl system-libfmt +telemetry video"
+IUSE="cubeb +hle-sound nls +qt5 sdl +telemetry video"
DEPEND="
cubeb? ( media-libs/cubeb )
@@ -29,22 +34,21 @@ DEPEND="
media-libs/libsdl2
>=dev-libs/inih-52
)
- system-libfmt? ( <=dev-libs/libfmt-8 )
video? ( media-video/ffmpeg )
>=app-arch/zstd-1.4.8
+ >=dev-libs/libfmt-8
>=dev-libs/openssl-1.1
dev-cpp/catch:0
+ dev-cpp/robin-map
dev-libs/boost:=
dev-libs/crypto++
net-libs/enet:1.3
+ virtual/libusb:1
"
RDEPEND="${DEPEND}"
REQUIRED_USE="|| ( qt5 sdl )"
src_unpack() {
- if use system-libfmt; then
- EGIT_SUBMODULES+=( "-fmt" "-externals/dynarmic/externals/fmt" )
- fi
git-r3_src_unpack
cp -a "${S}"/externals/xbyak "${S}"/externals/dynarmic/externals/ || die
@@ -54,6 +58,11 @@ src_unpack() {
}
src_prepare() {
+ # Dynarmic: ensure those are unbundled
+ for ext in fmt catch robin-map; do
+ rm -rf externals/dynarmic/externals/${ext} || die
+ done
+
# Do not care about submodules wanted one are already fetched
sed -i -e '/check_submodules_present()/d' CMakeLists.txt || die
@@ -80,12 +89,12 @@ src_prepare() {
src/{citra,citra_qt,dedicated_room,tests}/CMakeLists.txt || die
sed -i -e '1ifind_package(OpenSSL 1.1)' src/{citra,citra_qt,dedicated_room,tests}/CMakeLists.txt || die
- if use system-libfmt; then # Unbundle libfmt
- sed -i -e '/fmt/d' externals/CMakeLists.txt || die
- sed -i -e 's/fmt/&::&/' -e '1ifind_package(fmt)' \
- src/{core,citra,citra_qt,dedicated_room,input_common,tests,video_core}/CMakeLists.txt || die
- sed -i -e '1ifind_package(fmt)' externals/dynarmic/src/CMakeLists.txt || die
- fi
+ # Unbundle libfmt
+ sed -i -e '/fmt/d' externals/CMakeLists.txt || die
+ sed -i -e 's/fmt/&::&/' -e '1ifind_package(fmt)' \
+ src/{core,citra,citra_qt,dedicated_room,input_common,tests,video_core}/CMakeLists.txt || die
+ sed -i -e '1ifind_package(fmt)' externals/dynarmic/src/CMakeLists.txt || die
+ sed -i -e '/^#pragma once$/a#include <algorithm>' src/common/logging/log.h || die
# Unbundle zstd
sed -i -e 's:libzstd_static:${ZSTD_LIBRARIES}:' \
diff --git a/games-emulation/citra/metadata.xml b/games-emulation/citra/metadata.xml
index 87cb3dfdc..acd89943b 100644
--- a/games-emulation/citra/metadata.xml
+++ b/games-emulation/citra/metadata.xml
@@ -8,7 +8,6 @@
<use>
<flag name="cubeb">Enables the cubeb audio backend</flag>
<flag name="hle-sound">Enable HLE sound via FFmpeg audio (AAC) decoder</flag>
- <flag name="system-libfmt">Use system libfmt</flag>
<flag name="telemetry">Enable web services (telemetry, etc.)</flag>
<flag name="video">Enable FFmpeg video dumper</flag>
</use>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-emulation/citra/
@ 2021-08-07 17:48 Florian Schmaus
0 siblings, 0 replies; 16+ messages in thread
From: Florian Schmaus @ 2021-08-07 17:48 UTC (permalink / raw
To: gentoo-commits
commit: fa34e16745935df256c11c9ce89c29d68b8bb974
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Wed Aug 4 00:39:09 2021 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Aug 4 00:39:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa34e167
games-emulation/citra: new package
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/citra/citra-9999.ebuild | 137 ++++++++++++++++++++++++++++++++
games-emulation/citra/metadata.xml | 15 ++++
2 files changed, 152 insertions(+)
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
new file mode 100644
index 000000000..aa5eff558
--- /dev/null
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 xdg
+
+DESCRIPTION="A Nintendo 3DS Emulator"
+HOMEPAGE="https://citra-emu.org"
+EGIT_REPO_URI="https://github.com/citra-emu/citra"
+EGIT_SUBMODULES=( "*" "-boost" "-catch" "-cryptopp" "-enet" "-inih" "-libressl" "-externals/dynarmic/externals/xbyak" "-zstd" )
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="cubeb +hle-sound nls +qt5 sdl system-libfmt +telemetry video"
+
+DEPEND="
+ !hle-sound? ( media-libs/fdk-aac )
+ hle-sound? ( media-video/ffmpeg[fdk] )
+ qt5? ( nls? ( dev-qt/linguist )
+ dev-qt/qtgui
+ dev-qt/qtmultimedia
+ dev-qt/qtnetwork
+ dev-qt/qtopengl
+ dev-qt/qtwidgets )
+ sdl? (
+ media-libs/libsdl2
+ >=dev-libs/inih-52
+ )
+ system-libfmt? ( <=dev-libs/libfmt-8 )
+ video? ( media-video/ffmpeg )
+ >=app-arch/zstd-1.4.8
+ >=dev-libs/openssl-1.1
+ dev-cpp/catch:0
+ dev-libs/boost:=
+ dev-libs/crypto++
+ net-libs/enet:1.3
+"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="|| ( qt5 sdl )"
+
+src_unpack() {
+ if use system-libfmt; then
+ EGIT_SUBMODULES+=( "-fmt" "-externals/dynarmic/externals/fmt" )
+ fi
+ git-r3_src_unpack
+
+ cp -a "${S}"/externals/xbyak "${S}"/externals/dynarmic/externals/ || die
+
+ # Do not fetch via sources because this file always changes
+ curl https://api.citra-emu.org/gamedb/ > "${S}"/compatibility_list.json
+}
+
+src_prepare() {
+ # Do not care about submodules wanted one are already fetched
+ sed -i -e '/check_submodules_present()/d' CMakeLists.txt || die
+
+ # Unbundle inih
+ sed -i -e '/inih/d' externals/CMakeLists.txt || die
+ sed -i -e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(INIH REQUIRED INIReader)' \
+ -e '/target_link_libraries/s/inih/${INIH_LIBRARIES}/' src/citra/CMakeLists.txt || die
+ sed -i -e 's:inih/cpp/::' src/citra/config.cpp || die
+
+ # Fix boost unbundling
+ sed -i -e '/(-DBOOST_ERROR_CODE_HEADER_ONLY/,/)/d' CMakeLists.txt || die
+ sed -i -e '/[Bb][Oo][Oo][Ss][Tt]/d' externals/CMakeLists.txt || die
+
+ # Unbundle libressl (TODO rework scopes, find_package(OpenSSL is called 5 times)
+ sed -i -e '$afind_package(OpenSSL 1.1)\nset(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto PARENT_SCOPE)' \
+ CMakeLists.txt || die
+ sed -i -e 's/# LibreSSL/find_package(OpenSSL 1.1)\nif (NOT OPENSSL_FOUND)\n/' \
+ -e 's/-DHAVE_INET_NTOP)$/&\nendif()\n/' externals/CMakeLists.txt || die
+ sed -i -e '/get_directory_property(OPENSSL_LIBS/,/)/d' \
+ -e 's/OPENSSL_LIBS/OPENSSL_LIBRARIES/' \
+ src/web_service/CMakeLists.txt \
+ src/core/CMakeLists.txt || die
+ sed -i -e 's/{PLATFORM_LIBRARIES}/& OpenSSL::SSL OpenSSL::Crypto/' \
+ src/{citra,citra_qt,dedicated_room,tests}/CMakeLists.txt || die
+ sed -i -e '1ifind_package(OpenSSL 1.1)' src/{citra,citra_qt,dedicated_room,tests}/CMakeLists.txt || die
+
+ if use system-libfmt; then # Unbundle libfmt
+ sed -i -e '/fmt/d' externals/CMakeLists.txt || die
+ sed -i -e 's/fmt/&::&/' -e '1ifind_package(fmt)' \
+ src/{core,citra,citra_qt,dedicated_room,input_common,tests,video_core}/CMakeLists.txt
+ sed -i -e '1ifind_package(fmt)' externals/dynarmic/src/CMakeLists.txt || die
+ fi
+
+ # Unbundle zstd
+ sed -i -e 's:libzstd_static:${ZSTD_LIBRARIES}:' \
+ -e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(ZSTD REQUIRED libzstd)' \
+ src/common/CMakeLists.txt || die
+ sed -i -e '/zstd/d' externals/CMakeLists.txt || die
+
+ # Unbundle enet
+ sed -i -e 's:enet:${ENET_LIBRARIES}:' \
+ -e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(ENET REQUIRED libenet)' \
+ src/network/CMakeLists.txt || die
+ sed -i -e '/#include.*enet/{s/"/</;s/"/>/}' src/network/*cpp || die
+ sed -i -e '/enet/d' externals/CMakeLists.txt || die
+
+ # Unbundle crypto++
+ sed -i -e 's:cryptopp:${CRYPTOPP_LIBRARIES}:' \
+ -e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(CRYPTOPP REQUIRED libcryptopp)' \
+ src/dedicated_room/CMakeLists.txt \
+ src/core/CMakeLists.txt || die
+ sed -i -e '/cryptopp/d' externals/CMakeLists.txt || die
+
+ # TODO unbundle catch
+ sed -i -e '1ifind_package(Catch2)' src/tests/CMakeLists.txt externals/{dynarmic,teakra}/tests/CMakeLists.txt || die
+ sed -i -e '/target_link_libraries/s/catch/Catch2::Catch2/' externals/{dynarmic,teakra}/tests/CMakeLists.txt || die
+ sed -i -e '/target_link_libraries/s/catch-single-include/Catch2::Catch2/' src/tests/CMakeLists.txt || die
+ sed -i -e '/catch/d' externals/CMakeLists.txt externals/{dynarmic,teakra}/externals/CMakeLists.txt || die
+ grep -rl 'include <catch.hpp>' externals/{dynarmic,teakra} | xargs sed -i -e '/include/s:catch.hpp:catch/&:' || die
+
+ # TODO unbundle xbyak (wait for 5.96 in ytree)
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=OFF
+ -DENABLE_CUBEB=$(usex cubeb)
+ -DENABLE_FFMPEG_AUDIO_DECODER=$(usex hle-sound)
+ -DENABLE_FFMPEG_VIDEO_DUMPER=$(usex hle-sound)
+ -DENABLE_QT=$(usex qt5)
+ -DENABLE_QT_TRANSLATION=$(use qt5 && usex nls || echo OFF)
+ -DENABLE_SDL2=$(usex sdl)
+ -DENABLE_WEB_SERVICE=$(usex telemetry)
+ -DGENERATE_QT_TRANSLATION=$(use qt5 && usex nls || echo OFF)
+ -DUSE_SYSTEM_BOOST=ON
+ )
+ cmake_src_configure
+
+ # This would be better in src_unpack but it would be unlinked
+ mv "${S}"/compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die
+}
diff --git a/games-emulation/citra/metadata.xml b/games-emulation/citra/metadata.xml
new file mode 100644
index 000000000..87cb3dfdc
--- /dev/null
+++ b/games-emulation/citra/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <name>Samuel Bauer</name>
+ <email>samuel.bauer@yahoo.fr</email>
+</maintainer>
+<use>
+ <flag name="cubeb">Enables the cubeb audio backend</flag>
+ <flag name="hle-sound">Enable HLE sound via FFmpeg audio (AAC) decoder</flag>
+ <flag name="system-libfmt">Use system libfmt</flag>
+ <flag name="telemetry">Enable web services (telemetry, etc.)</flag>
+ <flag name="video">Enable FFmpeg video dumper</flag>
+</use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2024-03-07 13:24 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-07 13:13 [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/citra/ Viorel Munteanu
2024-03-07 13:24 ` [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
-- strict thread matches above, loose matches on Subject: below --
2023-08-23 17:33 David Roman
2023-07-27 12:04 David Roman
2023-07-27 12:04 David Roman
2023-07-27 12:04 David Roman
2023-07-13 9:42 David Roman
2022-09-27 20:43 Haelwenn Monnier
2022-09-27 20:43 Haelwenn Monnier
2022-09-27 20:43 Haelwenn Monnier
2022-09-26 9:48 Andrew Ammerlaan
2022-09-26 9:48 Andrew Ammerlaan
2022-09-09 20:02 Ronny Gutbrod
2022-05-23 17:15 Haelwenn Monnier
2022-01-21 9:14 Florian Schmaus
2021-08-07 17:48 Florian Schmaus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox