commit: 907b4a3ce034b55dacb49025fa219ef13ad1d738
Author: Vincent Ahluwalia <vincentahluwalia <AT> protonmail <DOT> com>
AuthorDate: Sat Feb 15 14:31:07 2025 +0000
Commit: Vincent Ahluwalia <vincentahluwalia <AT> protonmail <DOT> com>
CommitDate: Sat Feb 15 14:31:07 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=907b4a3c
games-util/chiaki: add 2.2.0, drop 2.1.1-r1, add USE flags
Signed-off-by: Vincent Ahluwalia <vincentahluwalia <AT> protonmail.com>
games-util/chiaki/Manifest | 2 +-
...{chiaki-2.1.1-r2.ebuild => chiaki-2.2.0.ebuild} | 41 +++++++++++++---------
games-util/chiaki/chiaki-9999.ebuild | 41 +++++++++++++---------
games-util/chiaki/metadata.xml | 5 +++
4 files changed, 56 insertions(+), 33 deletions(-)
diff --git a/games-util/chiaki/Manifest b/games-util/chiaki/Manifest
index dd0b8363a..52ce7571d 100644
--- a/games-util/chiaki/Manifest
+++ b/games-util/chiaki/Manifest
@@ -1 +1 @@
-DIST chiaki-2.1.1.tar.gz 6755442 BLAKE2B
6131b15d01b6ea96eedca0e8a3989bd353142ccc0fa34d159b1bf0a15412f315934b642f5e9e576dd8155506b85054000e54500e5966a3677bd60c989b2c9303
SHA512
3e0d8afd71f6f348d5ab0e68c7c46b9ee7d249d8b6b1185a746cb8b3907ea21db24756d5ec9de8debafbfffe74698358d29a97bc213cff7944ea15e894c3da50
+DIST chiaki-2.2.0.tar.gz 11923395 BLAKE2B
f1095f6effad1ef48d49fa757877042b7173f16a2d6c49886528c279caa5eba8b56e01b085b83c3fda6831c745de337cd01dd87cd0eea54d84a1ec3d2ca78b28
SHA512
1d9c02911073776047c472043526f27ab53d5a517e4646b8d2c910401dffd20a5aaebe5737c9cb399665e2334e1a75b2528c3d03a200dc88423141f96127897e
diff --git a/games-util/chiaki/chiaki-2.1.1-r2.ebuild
b/games-util/chiaki/chiaki-2.2.0.ebuild
similarity index 54%
rename from games-util/chiaki/chiaki-2.1.1-r2.ebuild
rename to games-util/chiaki/chiaki-2.2.0.ebuild
index fd519c7cd..825d18ded 100644
--- a/games-util/chiaki/chiaki-2.1.1-r2.ebuild
+++ b/games-util/chiaki/chiaki-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,25 +20,30 @@ fi
LICENSE="GPL-3"
SLOT="0"
-IUSE="+cli +gui test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="+cli +gui +sdl +ffmpeg system-jerasure system-nanopb mbedtls test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ gui? ( ffmpeg )
+"
RESTRICT="!test? ( test )"
RDEPEND="
${PYTHON_DEPS}
- dev-libs/jerasure
dev-libs/libevdev
- dev-libs/openssl:=
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtconcurrent:5
- dev-qt/qtmultimedia:5
- dev-qt/qtopengl:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- media-libs/libsdl2
media-libs/opus
- media-video/ffmpeg:=
+ sdl? ( media-libs/libsdl2[joystick,haptic] )
+ gui? ( dev-qt/qtcore:5 )
+ gui? ( dev-qt/qtwidgets:5 )
+ gui? ( dev-qt/qtgui:5 )
+ gui? ( dev-qt/qtconcurrent:5 )
+ gui? ( dev-qt/qtmultimedia:5 )
+ gui? ( dev-qt/qtopengl:5 )
+ gui? ( dev-qt/qtsvg:5 )
+ !mbedtls? ( dev-libs/openssl:= )
+ mbedtls? ( net-libs/mbedtls )
+ ffmpeg? ( media-video/ffmpeg:= )
+ system-jerasure? ( dev-libs/jerasure )
+ system-nanopb? ( dev-libs/nanopb )
"
DEPEND="${RDEPEND}"
@@ -53,10 +58,14 @@ BDEPEND="
src_configure() {
local mycmakeargs=(
-DPYTHON_EXECUTABLE="${PYTHON}"
- -DCHIAKI_USE_SYSTEM_JERASURE=TRUE
+ -DCHIAKI_USE_SYSTEM_JERASURE=$(usex system-jerasure)
+ -DCHIAKI_USE_SYSTEM_NANOPB=$(usex system-nanopb)
-DCHIAKI_ENABLE_TESTS=$(usex test)
-DCHIAKI_ENABLE_CLI=$(usex cli)
-DCHIAKI_ENABLE_GUI=$(usex gui)
+ -DCHIAKI_ENABLE_FFMPEG_DECODER=$(usex ffmpeg)
+ -DCHIAKI_LIB_ENABLE_MBEDTLS=$(usex mbedtls)
+ -DCHIAKI_GUI_ENABLE_SDL_GAMECONTROLLER=$(usex sdl)
)
cmake_src_configure
@@ -66,5 +75,5 @@ src_install() {
cmake_src_install
dolib.so "${BUILD_DIR}"/lib/*.so
- dolib.so "${BUILD_DIR}"/setsu/*.so
+ use sdl || dolib.so "${BUILD_DIR}"/setsu/*.so
}
diff --git a/games-util/chiaki/chiaki-9999.ebuild
b/games-util/chiaki/chiaki-9999.ebuild
index fd519c7cd..825d18ded 100644
--- a/games-util/chiaki/chiaki-9999.ebuild
+++ b/games-util/chiaki/chiaki-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,25 +20,30 @@ fi
LICENSE="GPL-3"
SLOT="0"
-IUSE="+cli +gui test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="+cli +gui +sdl +ffmpeg system-jerasure system-nanopb mbedtls test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ gui? ( ffmpeg )
+"
RESTRICT="!test? ( test )"
RDEPEND="
${PYTHON_DEPS}
- dev-libs/jerasure
dev-libs/libevdev
- dev-libs/openssl:=
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtconcurrent:5
- dev-qt/qtmultimedia:5
- dev-qt/qtopengl:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- media-libs/libsdl2
media-libs/opus
- media-video/ffmpeg:=
+ sdl? ( media-libs/libsdl2[joystick,haptic] )
+ gui? ( dev-qt/qtcore:5 )
+ gui? ( dev-qt/qtwidgets:5 )
+ gui? ( dev-qt/qtgui:5 )
+ gui? ( dev-qt/qtconcurrent:5 )
+ gui? ( dev-qt/qtmultimedia:5 )
+ gui? ( dev-qt/qtopengl:5 )
+ gui? ( dev-qt/qtsvg:5 )
+ !mbedtls? ( dev-libs/openssl:= )
+ mbedtls? ( net-libs/mbedtls )
+ ffmpeg? ( media-video/ffmpeg:= )
+ system-jerasure? ( dev-libs/jerasure )
+ system-nanopb? ( dev-libs/nanopb )
"
DEPEND="${RDEPEND}"
@@ -53,10 +58,14 @@ BDEPEND="
src_configure() {
local mycmakeargs=(
-DPYTHON_EXECUTABLE="${PYTHON}"
- -DCHIAKI_USE_SYSTEM_JERASURE=TRUE
+ -DCHIAKI_USE_SYSTEM_JERASURE=$(usex system-jerasure)
+ -DCHIAKI_USE_SYSTEM_NANOPB=$(usex system-nanopb)
-DCHIAKI_ENABLE_TESTS=$(usex test)
-DCHIAKI_ENABLE_CLI=$(usex cli)
-DCHIAKI_ENABLE_GUI=$(usex gui)
+ -DCHIAKI_ENABLE_FFMPEG_DECODER=$(usex ffmpeg)
+ -DCHIAKI_LIB_ENABLE_MBEDTLS=$(usex mbedtls)
+ -DCHIAKI_GUI_ENABLE_SDL_GAMECONTROLLER=$(usex sdl)
)
cmake_src_configure
@@ -66,5 +75,5 @@ src_install() {
cmake_src_install
dolib.so "${BUILD_DIR}"/lib/*.so
- dolib.so "${BUILD_DIR}"/setsu/*.so
+ use sdl || dolib.so "${BUILD_DIR}"/setsu/*.so
}
diff --git a/games-util/chiaki/metadata.xml b/games-util/chiaki/metadata.xml
index 472196455..3131a02ea 100644
--- a/games-util/chiaki/metadata.xml
+++ b/games-util/chiaki/metadata.xml
@@ -7,6 +7,11 @@
</maintainer>
<use>
<flag name="cli">Build CLI interface</flag>
+ <flag name="gui">Build Qt GUI interface</flag>
+ <flag name="system-jerasure">Use system-provided jerasure
instead of submodule</flag>
+ <flag name="system-nanopb">Use system-provided nanopb instead
of submodule</flag>
+ <flag name="sdl">Add support for touchpad and sensor handling
via SDL. Adds support for any controller supported by SDL</flag>
+ <flag name="mbedtls">Use mbedtls instead of OpenSSL as part of
Chiaki lib</flag>
</use>
<longdescription lang="en">
Chiaki is a Free and Open Source Software Client for PlayStation 4 and
