mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-04-07 03:10:15 -04:00
games-util/chiaki-ng: add 1.9.9, drop 1.9.5
- bump to 1.9.9, drop old 1.9.5 - fix build problem about qt6-guiprivate - patched to use the dynamic nanopb Closes: https://bugs.gentoo.org/965824 Signed-off-by: Huang Rui <vowstar@gmail.com>
This commit is contained in:
@@ -1,2 +1,2 @@
|
||||
DIST chiaki-ng-1.9.5.tar.gz 40761504 BLAKE2B 7fc18e56e1cde187a42225df15ffb8c150b11db73189c2e3f2d1c263806a76210704e9b60e38ed89d3883b1dd7638f34609f9eb106f0c8ba0e19d0ad64368754 SHA512 d89a67143e60170188b146555efbcb1545fe5ee1b0a3c43b5d0a54b5947f261eb7fc9d9f4604c7e09647661c07f7c5468b0cbd8a22748646dc514ad7c4c4b321
|
||||
DIST chiaki-ng-1.9.9.tar.gz 40777945 BLAKE2B 48db882e9d183f05f9549ef17c536b02f11104f78a02e1c5c2bfd9117997b7060e635139d9a61a13fc0712567ffe0c767b67bf683b46a64962f272d059817fc1 SHA512 a71f2c94f6322785334d226b3d29e9c845202c78e96e31ac2a5f27c1e8a7879551a3d839cb1814cac3909f2c2da4a942aac5c83f690fe1699d332afbdce6c7be
|
||||
DIST munit-439de4a9b136bc3b5163e73d4caf37c590bef875.tar.gz 27747 BLAKE2B 81cac50228c9e782ce2100edc42462d900c08c6dd43c8a6e10abb6a72db559e780fc57e2a26cf308081cc4d55815e1444d8704af4b0fad73076c015753ca8bb8 SHA512 28fbe29636fd3ecb675f2e823165ac88be10adfbb2d4155fee43a4b2747c8dd4f24808ed9ddedd9a2ec60d96367e60fce8ca82c54b0eb605ed9b4bb05392a872
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
|
||||
EAPI=8
|
||||
|
||||
VER_MUNIT="439de4a9b136bc3b5163e73d4caf37c590bef875"
|
||||
VER_MUNIT="439de4a9b136bc3b5163e73d4caf37c590bef875" # Assuming unchanged, will verify if build fails
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..13} )
|
||||
PYTHON_COMPAT=( python3_{10..14} )
|
||||
inherit cmake python-single-r1 xdg
|
||||
|
||||
DESCRIPTION="Client for PlayStation 4 and PlayStation 5 Remote Play"
|
||||
@@ -40,6 +40,7 @@ RDEPEND="
|
||||
media-libs/opus
|
||||
net-dns/libidn2
|
||||
net-misc/curl
|
||||
media-video/pipewire
|
||||
sdl? ( media-libs/libsdl2[joystick,haptic] )
|
||||
gui? (
|
||||
dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl,widgets]
|
||||
@@ -63,6 +64,16 @@ BDEPEND="
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
# Fix build failure with Qt 6.10+ (GuiPrivate not found)
|
||||
# https://github.com/streetpea/chiaki-ng/issues/669
|
||||
# https://github.com/streetpea/chiaki-ng/pull/670
|
||||
"${FILESDIR}/${P}-fix-qt6-guiprivate.patch"
|
||||
# Use shared nanopb library instead of static
|
||||
# https://bugs.gentoo.org/965824
|
||||
"${FILESDIR}/${P}-use-shared-nanopb.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
|
||||
@@ -79,7 +90,6 @@ src_configure() {
|
||||
-DCHIAKI_USE_SYSTEM_NANOPB=ON
|
||||
-DCHIAKI_USE_SYSTEM_CURL=ON
|
||||
-DCHIAKI_ENABLE_STEAM_SHORTCUT=OFF # BUG: require cpp-steam-tools, used by steamdeck
|
||||
-DCHIAKI_ENABLE_SWITCH_CURL=ON # BUG: Gentoo use CURL::libcurl instead of CURL::libcurl_shared
|
||||
-DCHIAKI_ENABLE_STEAMDECK_NATIVE=OFF # Used by steamdeck
|
||||
-DCHIAKI_ENABLE_TESTS=$(usex test)
|
||||
-DCHIAKI_ENABLE_CLI=$(usex cli)
|
||||
@@ -3,9 +3,9 @@
|
||||
|
||||
EAPI=8
|
||||
|
||||
VER_MUNIT="439de4a9b136bc3b5163e73d4caf37c590bef875"
|
||||
VER_MUNIT="439de4a9b136bc3b5163e73d4caf37c590bef875" # Assuming unchanged, will verify if build fails
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..13} )
|
||||
PYTHON_COMPAT=( python3_{10..14} )
|
||||
inherit cmake python-single-r1 xdg
|
||||
|
||||
DESCRIPTION="Client for PlayStation 4 and PlayStation 5 Remote Play"
|
||||
@@ -40,6 +40,7 @@ RDEPEND="
|
||||
media-libs/opus
|
||||
net-dns/libidn2
|
||||
net-misc/curl
|
||||
media-video/pipewire
|
||||
sdl? ( media-libs/libsdl2[joystick,haptic] )
|
||||
gui? (
|
||||
dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl,widgets]
|
||||
@@ -63,6 +64,12 @@ BDEPEND="
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
# Use shared nanopb library instead of static
|
||||
# https://bugs.gentoo.org/965824
|
||||
"${FILESDIR}/${PN}-1.9.9-use-shared-nanopb.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
|
||||
@@ -79,7 +86,6 @@ src_configure() {
|
||||
-DCHIAKI_USE_SYSTEM_NANOPB=ON
|
||||
-DCHIAKI_USE_SYSTEM_CURL=ON
|
||||
-DCHIAKI_ENABLE_STEAM_SHORTCUT=OFF # BUG: require cpp-steam-tools, used by steamdeck
|
||||
-DCHIAKI_ENABLE_SWITCH_CURL=ON # BUG: Gentoo use CURL::libcurl instead of CURL::libcurl_shared
|
||||
-DCHIAKI_ENABLE_STEAMDECK_NATIVE=OFF # Used by steamdeck
|
||||
-DCHIAKI_ENABLE_TESTS=$(usex test)
|
||||
-DCHIAKI_ENABLE_CLI=$(usex cli)
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From fe5bfd87998c7ca67ade76436e31ab9924000c8b Mon Sep 17 00:00:00 2001
|
||||
From: Morgan Helton <mhelton@gmail.com>
|
||||
Date: Fri, 24 Oct 2025 20:03:09 -0500
|
||||
Subject: [PATCH] Add Qt6::GuiPrivate link conditional on Qt version
|
||||
|
||||
Fix build failure with Qt 6.10+
|
||||
Upstream fix: https://github.com/streetpea/chiaki-ng/pull/670
|
||||
Related issue: https://github.com/streetpea/chiaki-ng/issues/669
|
||||
---
|
||||
gui/CMakeLists.txt | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
|
||||
index 201dfaf4..7e777e1f 100755
|
||||
--- a/gui/CMakeLists.txt
|
||||
+++ b/gui/CMakeLists.txt
|
||||
@@ -8,6 +8,10 @@ if(APPLE)
|
||||
endif()
|
||||
|
||||
find_package(Qt6 REQUIRED COMPONENTS Core Gui Concurrent Svg Qml Quick Widgets)
|
||||
+if(Qt6_VERSION VERSION_GREATER_EQUAL "6.10.0")
|
||||
+ find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
|
||||
+endif()
|
||||
+
|
||||
find_package(Qt6 COMPONENTS WebEngineQuick)
|
||||
find_package(Qt6 COMPONENTS DBus)
|
||||
|
||||
@@ -154,4 +158,4 @@ install(TARGETS chiaki
|
||||
BUNDLE DESTINATION bin)
|
||||
install(FILES chiaking.desktop DESTINATION share/applications)
|
||||
install(FILES chiaking.png DESTINATION share/icons/hicolor/512x512/apps)
|
||||
-install(FILES io.github.streetpea.Chiaki4deck.appdata.xml DESTINATION share/metainfo)
|
||||
\ No newline at end of file
|
||||
+install(FILES io.github.streetpea.Chiaki4deck.appdata.xml DESTINATION share/metainfo)
|
||||
@@ -0,0 +1,29 @@
|
||||
From: Huang Rui <vowstar@gmail.com>
|
||||
Date: Sat, 13 Dec 2025 12:28:22 +0800
|
||||
Subject: [PATCH] Use shared nanopb library instead of static
|
||||
|
||||
Gentoo provides nanopb as a shared library by default. This patch
|
||||
allows chiaki-ng to link against the shared version, falling back
|
||||
to static if shared is not available.
|
||||
|
||||
Bug: https://bugs.gentoo.org/965824
|
||||
---
|
||||
cmake/FindNanopb.cmake | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/FindNanopb.cmake b/cmake/FindNanopb.cmake
|
||||
index 1234567..abcdefg 100644
|
||||
--- a/cmake/FindNanopb.cmake
|
||||
+++ b/cmake/FindNanopb.cmake
|
||||
@@ -12,6 +12,10 @@ find_package_handle_standard_args(Nanopb
|
||||
|
||||
if(Nanopb_FOUND)
|
||||
if(NOT TARGET Nanopb::nanopb)
|
||||
- add_library(Nanopb::nanopb ALIAS nanopb::protobuf-nanopb-static)
|
||||
+ if(TARGET nanopb::protobuf-nanopb)
|
||||
+ add_library(Nanopb::nanopb ALIAS nanopb::protobuf-nanopb)
|
||||
+ else()
|
||||
+ add_library(Nanopb::nanopb ALIAS nanopb::protobuf-nanopb-static)
|
||||
+ endif()
|
||||
endif()
|
||||
endif()
|
||||
Reference in New Issue
Block a user