From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A22F11582EF for ; Mon, 10 Mar 2025 13:16:27 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 885AA3430B1 for ; Mon, 10 Mar 2025 13:16:27 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id B87DB11037D; Mon, 10 Mar 2025 13:16:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id A86AE11037D for ; Mon, 10 Mar 2025 13:16:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52DC3342FEC for ; Mon, 10 Mar 2025 13:16:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B58791F05 for ; Mon, 10 Mar 2025 13:16:21 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1741612533.8f14be921ff0def5877bf99c3351e938aa11a553.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/pcsx2/, games-emulation/pcsx2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/pcsx2/Manifest games-emulation/pcsx2/files/pcsx2-1.7.5855-no-libbacktrace.patch games-emulation/pcsx2/pcsx2-2.0.2-r1.ebuild X-VCS-Directories: games-emulation/pcsx2/files/ games-emulation/pcsx2/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 8f14be921ff0def5877bf99c3351e938aa11a553 X-VCS-Branch: master Date: Mon, 10 Mar 2025 13:16:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 485053b7-050a-4c4b-ba3f-0d46365e1165 X-Archives-Hash: f2e3a7a76b8dcfd206bf283d6b5b31b7 commit: 8f14be921ff0def5877bf99c3351e938aa11a553 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Mar 10 13:05:29 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Mar 10 13:15:33 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f14be92 games-emulation/pcsx2: drop 2.0.2-r1 Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/pcsx2/Manifest | 1 - .../files/pcsx2-1.7.5855-no-libbacktrace.patch | 30 ---- games-emulation/pcsx2/pcsx2-2.0.2-r1.ebuild | 167 --------------------- 3 files changed, 198 deletions(-) diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index 2c48f884bace..9094f8e8d6de 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -1,2 +1 @@ -DIST pcsx2-2.0.2.tar.gz 16071515 BLAKE2B 328ea302ab2a7f7c4784844005ad4091d3f0b571c80f2a122136cc152fd46d4b1db4541e53ada09fc6cd15ebf37ae494911cadbbc7c57b92b494da355f67fcef SHA512 d442b1c5f9dbd1dca23261c56d0a433771928827b1ff9ebf5bea9cf5c5013defab659e7f0b63f5ce5c6ad856461c00f6ac98498a229300f8d58b9ea0ebf21507 DIST pcsx2-2.2.0.tar.gz 17097731 BLAKE2B 8df1ed7478491444c70a0e481f4ceff5e97d7378c2fee8566f0759f2c8bb1f0f10fb17d5cb26344bbac4150b534c518971bafd984338e386f855f83182d1e755 SHA512 4f67045b38ead6f48f99c27b02924b0ec97d3b79540d62900a6b4e7c3642594e53d37a0360d51077cc1c048175c89d891d7352d7db9231d128564b1d0242b7e0 diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.5855-no-libbacktrace.patch b/games-emulation/pcsx2/files/pcsx2-1.7.5855-no-libbacktrace.patch deleted file mode 100644 index 548f90e8ec1f..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.7.5855-no-libbacktrace.patch +++ /dev/null @@ -1,30 +0,0 @@ -libbacktrace used to be packaged in Gentoo but was last-rited due -to [1], and as of [2] pcsx2 no longer let it be optional albeit the -code to allow this still exists behind __APPLE__ which lacks it. - -May be revisited to see if re-packaging may be sane (not looked -into the issue much, could potentially mask libbacktrace and pcsx2 -on musl, or even bundle libbacktrace), but for now drop the -dependency again as it is fairly trivial. - -[1] https://bugs.gentoo.org/885471 -[2] https://github.com/PCSX2/pcsx2/commit/d48f527d6d88dfbf87 ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -71,3 +71,2 @@ - -- find_package(Libbacktrace REQUIRED) - find_package(PkgConfig REQUIRED) ---- a/common/CMakeLists.txt -+++ b/common/CMakeLists.txt -@@ -161,3 +161,2 @@ - ${DBUS_LINK_LIBRARIES} -- libbacktrace::libbacktrace - X11::X11 ---- a/common/CrashHandler.cpp -+++ b/common/CrashHandler.cpp -@@ -178,3 +178,3 @@ - --#elif !defined(__APPLE__) -+#elif 0 - diff --git a/games-emulation/pcsx2/pcsx2-2.0.2-r1.ebuild b/games-emulation/pcsx2/pcsx2-2.0.2-r1.ebuild deleted file mode 100644 index c4b0100a1622..000000000000 --- a/games-emulation/pcsx2/pcsx2-2.0.2-r1.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop fcaps flag-o-matic optfeature toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git" -else - SRC_URI=" - https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz - " - KEYWORDS="-* amd64" -fi - -DESCRIPTION="PlayStation 2 emulator" -HOMEPAGE="https://pcsx2.net/" - -LICENSE=" - GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 CC0-1.0 GPL-2+ - ISC LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain -" -SLOT="0" -IUSE="alsa cpu_flags_x86_sse4_1 +clang jack pulseaudio sndio test vulkan wayland" -REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support -RESTRICT="!test? ( test )" - -# dlopen: libglvnd, qtsvg, shaderc, vulkan-loader, wayland -COMMON_DEPEND=" - app-arch/lz4:= - app-arch/zstd:= - dev-qt/qtbase:6[concurrent,gui,widgets] - dev-qt/qtsvg:6 - media-libs/freetype - media-libs/libglvnd[X] - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/libsdl2[haptic,joystick] - media-libs/libwebp:= - media-video/ffmpeg:= - net-libs/libpcap - net-misc/curl - sys-apps/dbus - sys-libs/zlib:= - virtual/libudev:= - x11-libs/libXrandr - alsa? ( media-libs/alsa-lib ) - jack? ( virtual/jack ) - pulseaudio? ( media-libs/libpulse ) - sndio? ( media-sound/sndio:= ) - vulkan? ( - media-libs/shaderc - media-libs/vulkan-loader - ) - wayland? ( dev-libs/wayland ) -" -# patches is a optfeature but always pull given PCSX2 complaints if it -# is missing and it is fairly small (installs a ~1.5MB patches.zip) -RDEPEND=" - ${COMMON_DEPEND} -