public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/
Date: Sat,  1 Jan 2022 08:14:45 +0000 (UTC)	[thread overview]
Message-ID: <1641024784.20799a02b1ce02cd457cda4463c0bc5592d89d64.ionen@gentoo> (raw)

commit:     20799a02b1ce02cd457cda4463c0bc5592d89d64
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  1 05:21:12 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jan  1 08:13:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20799a02

games-emulation/pcsx2: update live ebuild

ebuild could use more attention before an eventual release (unbundling,
re-checking options/deps, wayland, making tests run), but this is just
quickfixes to at least let it build.

Two new dependencies:
* rapidyaml(new package): replaces yaml-cpp
* cubeb(submodule): replaces portaudio
pcsx2 isn't currently wired to use system's cubeb and it also isn't
packaged, so use submodule for now -- but it'd be good to package it
eventually given other packages like yuzu (which could be nice to have
in ::gentoo eventually) can use it as well. An ebuild would also help
for more proper backend support, but for now hard depend on pulseaudio
given it's the only one it links with. The cubeb introduction in PCSX2
is very recent so it may also be good to wait and see.

Also update licenses for cubeb(ISC) and libchdr(BSD).

/usr/bin/PCSX2 was also renamed to pcsx2, update ebuild to match.
Removed QA_* instead of updating them given the messages do not
seem to trigger anymore.

Runtime wasn't really tested, could be issues -- but it'd be expected
with upstream changing things around.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-emulation/pcsx2/pcsx2-9999.ebuild | 40 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 6c56bf44c0de..c80113c34e62 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-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
@@ -9,9 +9,13 @@ inherit cmake fcaps flag-o-matic git-r3 toolchain-funcs wxwidgets
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
 EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
-EGIT_SUBMODULES=( 3rdparty/libchdr/libchdr )
+EGIT_SUBMODULES=(
+	# TODO: unbundle
+	3rdparty/cubeb/cubeb
+	3rdparty/libchdr/libchdr
+)
 
-LICENSE="GPL-3"
+LICENSE="GPL-3 BSD ISC"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
@@ -19,33 +23,37 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	app-arch/bzip2
 	app-arch/xz-utils
-	dev-cpp/yaml-cpp:=
+	dev-cpp/rapidyaml:=
+	dev-libs/glib:2
 	dev-libs/libaio
 	>=dev-libs/libfmt-7.1.3:=
 	dev-libs/libxml2:2
 	media-libs/alsa-lib
+	media-libs/freetype
+	media-libs/libglvnd
 	media-libs/libpng:=
 	media-libs/libsamplerate
 	media-libs/libsdl2[haptic,joystick,sound]
-	media-libs/libsoundtouch
-	media-libs/portaudio
+	media-libs/libsoundtouch:=
+	media-sound/pulseaudio
 	net-libs/libpcap
 	sys-libs/zlib
-	virtual/libudev
-	virtual/opengl
+	virtual/libudev:=
+	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/libICE
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
 BDEPEND="test? ( dev-cpp/gtest )"
 
 FILECAPS=(
-	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/PCSX2
+	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
 )
 
 pkg_setup() {
@@ -73,7 +81,6 @@ src_configure() {
 		-DDISABLE_PCSX2_WRAPPER=TRUE
 		-DDISABLE_SETCAP=TRUE
 		-DENABLE_TESTS="$(usex test)"
-		-DOPTIMIZATION_FLAG=
 		-DPACKAGE_MODE=TRUE
 		-DXDG_STD=TRUE
 
@@ -87,12 +94,3 @@ src_configure() {
 	setup-wxwidgets
 	cmake_src_configure
 }
-
-src_install() {
-	# Upstream issues:
-	#  https://github.com/PCSX2/pcsx2/issues/417
-	#  https://github.com/PCSX2/pcsx2/issues/3077
-	QA_EXECSTACK="usr/bin/PCSX2"
-	QA_TEXTRELS="usr/$(get_libdir)/PCSX2/* usr/bin/PCSX2"
-	cmake_src_install
-}


             reply	other threads:[~2022-01-01  8:14 UTC|newest]

Thread overview: 177+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-01  8:14 Ionen Wolkens [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-12  9:35 [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/ Ionen Wolkens
2025-09-19  5:47 Ionen Wolkens
2025-09-08  6:01 Ionen Wolkens
2025-09-08  6:01 Ionen Wolkens
2025-08-10 22:47 Ionen Wolkens
2025-06-30  9:16 Ionen Wolkens
2025-06-30  6:09 Ionen Wolkens
2025-06-13  3:08 Ionen Wolkens
2025-03-13  6:10 Ionen Wolkens
2025-03-10 13:16 Ionen Wolkens
2025-03-05  4:51 Ionen Wolkens
2025-02-26 20:33 Arthur Zamarin
2025-02-21 15:07 Ionen Wolkens
2025-02-14  8:00 Ionen Wolkens
2025-01-08  1:38 Ionen Wolkens
2024-11-27 23:42 Ionen Wolkens
2024-11-04 16:15 Ionen Wolkens
2024-11-01  9:43 Ionen Wolkens
2024-11-01  9:43 Ionen Wolkens
2024-11-01  9:43 Ionen Wolkens
2024-09-08  6:05 Arthur Zamarin
2024-07-22  7:01 Ionen Wolkens
2024-07-22  7:01 Ionen Wolkens
2024-07-22  7:01 Ionen Wolkens
2024-07-20 23:50 Ionen Wolkens
2024-07-19  5:41 Ionen Wolkens
2024-07-13  6:00 Joonas Niilola
2024-06-22  9:34 Ionen Wolkens
2024-06-22  9:34 Ionen Wolkens
2024-06-11  7:16 Joonas Niilola
2024-05-21 17:40 Ionen Wolkens
2024-05-13  5:27 Joonas Niilola
2024-04-26 13:07 Ionen Wolkens
2024-04-26 13:01 Ionen Wolkens
2024-04-26 13:01 Ionen Wolkens
2024-04-22  7:26 Ionen Wolkens
2024-04-22  7:26 Ionen Wolkens
2024-04-22  7:26 Ionen Wolkens
2024-04-10  6:06 Joonas Niilola
2024-04-07 12:32 Ionen Wolkens
2024-04-06  8:03 Ionen Wolkens
2024-03-31 12:09 Ionen Wolkens
2024-03-21  6:37 Joonas Niilola
2024-03-20  7:17 Ionen Wolkens
2024-03-02 14:46 Ionen Wolkens
2024-02-18 18:27 Ionen Wolkens
2024-02-18  8:07 Joonas Niilola
2024-02-17 10:20 Ionen Wolkens
2024-01-17 14:45 Ionen Wolkens
2024-01-17 14:45 Ionen Wolkens
2024-01-15  7:29 Ionen Wolkens
2024-01-15  7:29 Ionen Wolkens
2024-01-15  7:29 Ionen Wolkens
2024-01-15  7:29 Ionen Wolkens
2023-12-31  7:10 Ionen Wolkens
2023-12-30 16:16 Ionen Wolkens
2023-12-19 11:44 Ionen Wolkens
2023-12-19 11:44 Ionen Wolkens
2023-12-19 11:44 Ionen Wolkens
2023-11-22 12:46 Ionen Wolkens
2023-11-19  5:54 Ionen Wolkens
2023-11-19  5:54 Ionen Wolkens
2023-10-26  5:40 Ionen Wolkens
2023-10-25  7:58 Ionen Wolkens
2023-10-19 13:35 Ionen Wolkens
2023-10-14  4:50 Ionen Wolkens
2023-09-19 11:36 Ionen Wolkens
2023-09-19 11:36 Ionen Wolkens
2023-09-19 11:36 Ionen Wolkens
2023-09-19 11:36 Ionen Wolkens
2023-09-17  4:26 Ionen Wolkens
2023-09-12 16:15 Ionen Wolkens
2023-08-27  5:03 Ionen Wolkens
2023-08-24  3:40 Ionen Wolkens
2023-07-25  0:10 Ionen Wolkens
2023-07-06  9:44 Ionen Wolkens
2023-06-24  4:14 Ionen Wolkens
2023-06-24  4:14 Ionen Wolkens
2023-06-02  6:54 Ionen Wolkens
2023-05-28 20:50 Andreas K. Hüttel
2023-05-26  2:39 Ionen Wolkens
2023-05-26  2:39 Ionen Wolkens
2023-05-23  2:52 Sam James
2023-05-16 17:21 Ionen Wolkens
2023-05-10 17:26 Ionen Wolkens
2023-05-10 17:26 Ionen Wolkens
2023-04-30 21:49 Ionen Wolkens
2023-04-26  8:37 Ionen Wolkens
2023-04-23  4:49 Ionen Wolkens
2023-03-28  7:41 Ionen Wolkens
2023-03-28  7:41 Ionen Wolkens
2023-03-25  3:19 Ionen Wolkens
2023-03-21  5:49 Ionen Wolkens
2023-03-19 22:44 Ionen Wolkens
2023-03-12  7:04 Ionen Wolkens
2023-02-13 11:46 Ionen Wolkens
2023-02-09 22:41 Ionen Wolkens
2023-02-02 22:52 Ionen Wolkens
2023-01-30 19:11 Ionen Wolkens
2023-01-25 22:33 Ionen Wolkens
2023-01-12 22:41 Ionen Wolkens
2023-01-11 11:26 Ionen Wolkens
2023-01-02 15:52 Ionen Wolkens
2023-01-02 11:08 Ionen Wolkens
2023-01-02  6:35 Ionen Wolkens
2023-01-02  5:47 Ionen Wolkens
2022-12-30 18:06 Ionen Wolkens
2022-12-29 20:29 Ionen Wolkens
2022-12-22  8:30 Ionen Wolkens
2022-12-19  5:48 Ionen Wolkens
2022-12-18  5:38 Ionen Wolkens
2022-11-20 21:33 Ionen Wolkens
2022-11-20 21:33 Ionen Wolkens
2022-10-21 10:27 Ionen Wolkens
2022-10-11 16:09 Andreas Sturmlechner
2022-10-03  5:25 Ionen Wolkens
2022-09-26 12:54 Ionen Wolkens
2022-09-23  4:00 Ionen Wolkens
2022-09-23  4:00 Ionen Wolkens
2022-09-23  3:02 Ionen Wolkens
2022-09-23  0:27 Ionen Wolkens
2022-08-12 22:00 James Le Cuirot
2022-06-23 21:04 Ionen Wolkens
2022-05-25  6:46 Ionen Wolkens
2022-05-19 15:20 Ionen Wolkens
2022-05-17  5:34 Sam James
2022-04-21  6:01 Ionen Wolkens
2022-03-14 11:43 Ionen Wolkens
2022-03-11  5:29 Ionen Wolkens
2022-03-02 19:35 Ionen Wolkens
2022-02-16 23:10 Ionen Wolkens
2022-01-27 21:10 Ionen Wolkens
2022-01-09 21:20 Ionen Wolkens
2022-01-06 20:52 Michał Górny
2022-01-06 15:02 Agostino Sarubbo
2022-01-05 23:09 Ionen Wolkens
2022-01-02  5:52 Sam James
2022-01-01 20:42 Ionen Wolkens
2021-09-24 21:23 Ionen Wolkens
2021-04-10  4:24 Sam James
2021-04-05 22:26 David Seifert
2021-03-01  8:26 Joonas Niilola
2021-03-01  8:26 Joonas Niilola
2021-03-01  8:26 Joonas Niilola
2021-02-20 10:10 Michał Górny
2021-02-20  1:26 Sam James
2021-02-19 20:12 Thomas Deutschmann
2021-01-15  8:44 Joonas Niilola
2021-01-15  8:44 Joonas Niilola
2021-01-15  8:44 Joonas Niilola
2021-01-15  8:44 Joonas Niilola
2020-11-12 21:28 Patrice Clement
2020-10-27  7:35 Joonas Niilola
2020-08-11 23:24 Matt Turner
2020-05-24 15:42 Andreas Sturmlechner
2020-05-17 16:42 Joonas Niilola
2020-05-17 16:42 Joonas Niilola
2020-05-17 16:42 Joonas Niilola
2020-03-15 18:41 Agostino Sarubbo
2020-03-15 11:45 Agostino Sarubbo
2020-03-14 12:07 Joonas Niilola
2020-03-14 12:07 Joonas Niilola
2020-02-08 17:06 David Seifert
2019-10-16  5:22 Joonas Niilola
2019-08-28 15:54 Joonas Niilola
2019-08-02 13:50 Joonas Niilola
2019-08-02 13:48 Joonas Niilola
2019-05-26 20:23 David Seifert
2019-05-08 17:05 Andreas Sturmlechner
2019-05-08 17:05 Andreas Sturmlechner
2018-10-27  8:03 Michał Górny
2017-11-04  7:13 Michael Palimaka
2017-07-30  9:38 Michał Górny
2017-05-24 12:14 Michał Górny
2016-12-29 11:41 Agostino Sarubbo
2016-12-29 11:38 Agostino Sarubbo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1641024784.20799a02b1ce02cd457cda4463c0bc5592d89d64.ionen@gentoo \
    --to=ionen@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox