* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/citra/, games-emulation/citra-canary/
@ 2023-02-02 0:02 Samuel Bauer
0 siblings, 0 replies; 3+ messages in thread
From: Samuel Bauer @ 2023-02-02 0:02 UTC (permalink / raw
To: gentoo-commits
commit: 7ca0947a0ac3c81aa95da1633423e3a855234ba5
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Wed Feb 1 23:59:58 2023 +0000
Commit: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Wed Feb 1 23:59:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7ca0947a
games-emulation/citra*: do not depend on dev-libs/cpp-httplib
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/citra-canary/citra-canary-9999.ebuild | 6 +-----
games-emulation/citra/citra-9999.ebuild | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/games-emulation/citra-canary/citra-canary-9999.ebuild b/games-emulation/citra-canary/citra-canary-9999.ebuild
index f1859c3a5..61b4e81ab 100644
--- a/games-emulation/citra-canary/citra-canary-9999.ebuild
+++ b/games-emulation/citra-canary/citra-canary-9999.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
virtual/libusb:1
"
DEPEND="${RDEPEND}"
-BDEPEND="dev-cpp/cpp-httplib
+BDEPEND="
dev-cpp/cpp-jwt
dev-cpp/robin-map"
REQUIRED_USE="|| ( qt5 sdl )"
@@ -144,10 +144,6 @@ 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
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index 2a6d8e781..02b932c58 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -43,7 +43,7 @@ RDEPEND="
virtual/libusb:1
"
DEPEND="${RDEPEND}"
-BDEPEND="dev-cpp/cpp-httplib
+BDEPEND="
dev-cpp/cpp-jwt
dev-cpp/robin-map"
REQUIRED_USE="|| ( qt5 sdl )"
@@ -126,10 +126,6 @@ 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/citra/, games-emulation/citra-canary/
@ 2023-02-13 15:05 Samuel Bauer
0 siblings, 0 replies; 3+ messages in thread
From: Samuel Bauer @ 2023-02-13 15:05 UTC (permalink / raw
To: gentoo-commits
commit: fcc7219a6ff9ca052d20c86afe50abff4724220a
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Mon Feb 13 15:00:38 2023 +0000
Commit: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Mon Feb 13 15:01:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fcc7219a
games-emulation/citra*: use system dev-cpp/cpp-httplib
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/citra-canary/citra-canary-9999.ebuild | 4 ++++
games-emulation/citra/citra-9999.ebuild | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/games-emulation/citra-canary/citra-canary-9999.ebuild b/games-emulation/citra-canary/citra-canary-9999.ebuild
index 61b4e81ab..d008cee0b 100644
--- a/games-emulation/citra-canary/citra-canary-9999.ebuild
+++ b/games-emulation/citra-canary/citra-canary-9999.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
+ dev-cpp/cpp-httplib
dev-cpp/cpp-jwt
dev-cpp/robin-map"
REQUIRED_USE="|| ( qt5 sdl )"
@@ -144,6 +145,9 @@ 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
+
# 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
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index 02b932c58..3350fa698 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
+ dev-cpp/cpp-httplib
dev-cpp/cpp-jwt
dev-cpp/robin-map"
REQUIRED_USE="|| ( qt5 sdl )"
@@ -126,6 +127,9 @@ 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
+
# 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/citra/, games-emulation/citra-canary/
@ 2023-03-07 18:23 Samuel Bauer
0 siblings, 0 replies; 3+ messages in thread
From: Samuel Bauer @ 2023-03-07 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 44a84b6400c24a0d3fe447a42b4d22681e3f4ad9
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Mar 7 18:22:39 2023 +0000
Commit: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Tue Mar 7 18:22:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=44a84b64
games-emulation/citra*: cpp-jwt and cryptopp unbundling review
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>
games-emulation/citra-canary/citra-canary-9999.ebuild | 6 +++---
games-emulation/citra/citra-9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/games-emulation/citra-canary/citra-canary-9999.ebuild b/games-emulation/citra-canary/citra-canary-9999.ebuild
index d008cee0b..38d8ea988 100644
--- a/games-emulation/citra-canary/citra-canary-9999.ebuild
+++ b/games-emulation/citra-canary/citra-canary-9999.ebuild
@@ -96,7 +96,7 @@ src_prepare() {
# 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
+ 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)' \
@@ -137,7 +137,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 '/cryptopp-cmake/d' externals/CMakeLists.txt || die
+ sed -i -e '/^# Crypto++/,/set(CRYPTOPP_COMPILE_DEFINITIONS/d' externals/CMakeLists.txt || die
# Unbundle cubeb
sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die
@@ -150,7 +150,7 @@ src_prepare() {
# 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
+ 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
diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index 3350fa698..819b844f6 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -78,7 +78,7 @@ src_prepare() {
# 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
+ 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)' \
@@ -119,7 +119,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 '/cryptopp-cmake/d' externals/CMakeLists.txt || die
+ sed -i -e '/^# Crypto++/,/set(CRYPTOPP_COMPILE_DEFINITIONS/d' externals/CMakeLists.txt || die
# Unbundle cubeb
sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die
@@ -132,7 +132,7 @@ src_prepare() {
# 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
+ 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-07 18:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-07 18:23 [gentoo-commits] repo/proj/guru:dev commit in: games-emulation/citra/, games-emulation/citra-canary/ Samuel Bauer
-- strict thread matches above, loose matches on Subject: below --
2023-02-13 15:05 Samuel Bauer
2023-02-02 0:02 Samuel Bauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox