From ec9f79e1d3358df31a704f16a76a269ccceae2b2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Dec 2022 20:03:07 +0000 Subject: gentoo auto-resync : 24:12:2022 - 20:03:07 --- games-emulation/Manifest.gz | Bin 9535 -> 9528 bytes games-emulation/pcsx2/Manifest | 3 +- .../pcsx2/files/pcsx2-1.7.3773-lto.patch | 9 +++ games-emulation/pcsx2/pcsx2-9999.ebuild | 89 +++++++++++---------- 4 files changed, 58 insertions(+), 43 deletions(-) create mode 100644 games-emulation/pcsx2/files/pcsx2-1.7.3773-lto.patch (limited to 'games-emulation') diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz index c6cf61c7e75d..adb007566a34 100644 Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index 55526884ab2c..db1ccfeefced 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -7,6 +7,7 @@ AUX pcsx2-1.7.3329-qt6.patch 371 BLAKE2B 15a8e221ee4b6f19c5956269908e9d3bad6a8fb AUX pcsx2-1.7.3351-unbundle.patch 1276 BLAKE2B 26af7e54f63bed99075f8155d237092d536b9ef420032d766ef4e41b7953c329f70d2040ae6a99142e0bc307fa9a534bd5db4e363e4e64a4291dc7a5760149b9 SHA512 7068a214cae03579e83ce14a5b953807a4f536be93946e15b58a33ede2497a128508ac2727fd1f602444906bc1497182a3740a1613d39300c403e387adbaa332 AUX pcsx2-1.7.3468-cubeb-automagic.patch 1635 BLAKE2B 90581edb3ed95fb011ecbd446e529b48544a0c8090e7e40b4aba6fb153a73e53f8399a61ee1d9fce180ac2ee44185cf7dac1972e62dc43648496774a7a8cfca9 SHA512 d2b92cc6530c706e0219b6eab5c8b52a3e93bcc16269400afbcbb3ca23edf07f511fd4116b02e77f89eb7083b9bb64f8bec85950d9d7e98ffdbbe351d4c70387 AUX pcsx2-1.7.3602-rapidyaml-0.5.0.patch 1680 BLAKE2B c14202812b98470c96145875035f4a71717e70d10b6cd2491e94f02e6b4ce70c9577f032b276e4b74910a5150cfb60b2acb4a55be2d2c1a064a8728fc52afdfc SHA512 29bafa6d37202c1c8aaea627f9d05cdf25da01ba8afef7ed0b34aeed114c36f0eb945fe0176cd3b4b67a972a9e757c3158a6c20fe5437d7ff22d9b776cf726cd +AUX pcsx2-1.7.3773-lto.patch 316 BLAKE2B 1c6e1d302545f5711a89058898616e4280c969478d51b4e03a53df155796f363658e65d0160fd2e88f09a9334301e00658c238af0122b6f01be709efbfb992d6 SHA512 2c5277498a90766b799a777cae0699699c2cec1d09bd152e4eee53f59ef12c7c17d11c012740992c56b4fc2bf0d8a39213dc2c97ee98a1fdd7b6ead27346aff7 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253 DIST pcsx2-1.7.3602.tar.gz 20035989 BLAKE2B bf28433b1df67b3b23655125b6cc6bdfa255468612081d2a64316cc335b97b43f66bc7ed683c19234df6136cb7f8fdf9dce3225865b2d404fc7c5b8b41733eea SHA512 cd5f5a4d347beb381fc13e969baa86887289f836a8b03ae6a926293a81699b3769cf23644a87cff41ec32355604bd735e59455fd13de5fc5aab121976626c16f DIST pcsx2-1.7.3738.tar.gz 15935061 BLAKE2B 51e113e2148c94861a3d6baab8de5b8ed613cdb6e3aa3574445f0a66e628dffb3bf26a6a3b54e0be65d71a90088fe6e79f65055d54e580d46ad4db1dadbb8a66 SHA512 7da8dd46cd065fefc4c2bb4ab76b8fc2bf9769dba78f47759c59b2a21e62cf0e5d53e9f800e16bf09238bf156cd7fa63a4ca75a47f41b78df9512a701536c789 @@ -17,5 +18,5 @@ DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd7 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b EBUILD pcsx2-1.7.3602.ebuild 7421 BLAKE2B 80fe2b2d7effdb93b807624984b9f5cdc7c0784443bbe5d9f279b21bb18d9b7dcdfd9816e0b9ffdd5292c6a136e0ec18761167bae57ff2fc31c84b73719ce7b8 SHA512 a1cd4f64dc32e7a0bf2f5d592b322b4b9ac7002c0afc15882602126c65a5bb324b8aa523414bc0a5a98f0956cfee823cbe778f19855f388b59f8f951a05dfcfc EBUILD pcsx2-1.7.3738.ebuild 7223 BLAKE2B c02603d27c072519b2e52392dbaad897921af6671593b04ad38d26fe0ef12a33893143c3e2066d04f75cbdd20d5114b26a4a9022fac6bdb6fd872f897633e2ce SHA512 04091cd4c39016d0934468c3e215b6463d488790b978038b306dbc5c205232c685a3bdde823e0868da4d760ea80b761f6dfb5d1e4ba03035f98189d95b09c685 -EBUILD pcsx2-9999.ebuild 7284 BLAKE2B 61a89fa7fda0a5e6f36d64e052c4c59b8fb3ba55835af3264d5073fecf859bd6bf9caefd15e4d27d3737e3d8b750b5de1436a486c568e8ff1864b5d8d1eb409e SHA512 6f0fc97b5d3a4e8afb9046e38898dd2780fa66586c7f75cfcc7b984ab086db4883a36787a6d2cdf44f892b6a402c59251566b98f10b6e4789568d55c70da057c +EBUILD pcsx2-9999.ebuild 7550 BLAKE2B 6d92205f7499448050bedaeff1ace83e697ec233c1fdd6d3ce237ec84400ab69ca97749a4fec42ca6ef2aefcc37f88c36d47594a30c37db8f3baf0ee4ea594c6 SHA512 301038226080b60f4b57156ed92aa86ab4f6f9cfcdce4f5532764c065ea166d4a647c8f4ebb8e12b41e044970c928a8e8f564e2f7804bf7d2335387c2a5cae04 MISC metadata.xml 805 BLAKE2B eb7ce944f7dc5b1889cc2b59f389eafabe9d5e44c4a730fa1352b0a00aec0f97d607204c440a9ce014e02f5b1a73c6ccd294074e7ce41f563c6c3643614ac9f6 SHA512 e8d939f76830204283557319961b4e3aab557e1c3e36fbfc98d4605b0728adb42d0731a05da998eb099f6b0df837eef7616cddb1e62b006979fb9262c172d961 diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3773-lto.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3773-lto.patch new file mode 100644 index 000000000000..cd0574bd5653 --- /dev/null +++ b/games-emulation/pcsx2/files/pcsx2-1.7.3773-lto.patch @@ -0,0 +1,9 @@ +Don't rely on the cmake macro to pass -fno-lto to the problematic +FastJmp.cpp so that it works if users add -flto themselves. +--- a/common/CMakeLists.txt ++++ b/common/CMakeLists.txt +@@ -275,3 +275,3 @@ + +-if (USE_GCC AND CMAKE_INTERPROCEDURAL_OPTIMIZATION) ++if (USE_GCC) + # GCC LTO doesn't work with asm statements diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index 43d70a563a48..17916151687b 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -3,8 +3,7 @@ EAPI=8 -WX_GTK_VER="3.0-gtk3" -inherit cmake fcaps flag-o-matic wxwidgets +inherit cmake desktop fcaps flag-o-matic if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -36,44 +35,34 @@ 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 jack pulseaudio qt6 sndio test vulkan wayland" +IUSE="alsa cpu_flags_x86_sse4_1 jack pulseaudio sndio test vulkan wayland" REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support RESTRICT="!test? ( test )" -# dlopen: ffmpeg, qtsvg, vulkan-loader +# dlopen: ffmpeg, qtsvg, vulkan-loader, wayland RDEPEND=" app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr - >=dev-libs/libfmt-7.1.3:= + dev-libs/libfmt:= dev-libs/libzip:=[zstd] - media-libs/harfbuzz + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 media-libs/libglvnd media-libs/libpng:= >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= media-video/ffmpeg:= net-libs/libpcap + net-misc/curl sys-libs/zlib:= virtual/libudev:= - x11-libs/libX11 x11-libs/libXrandr alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) pulseaudio? ( media-libs/libpulse ) - qt6? ( - dev-qt/qtbase:6[gui,network,widgets] - dev-qt/qtsvg:6 - net-misc/curl - ) - !qt6? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3[wayland?] - x11-libs/wxGTK:${WX_GTK_VER}[X] - ) sndio? ( media-sound/sndio:= ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland )" @@ -83,8 +72,7 @@ DEPEND=" test? ( dev-cpp/gtest )" BDEPEND=" dev-lang/perl - qt6? ( dev-qt/qttools[linguist] ) - !qt6? ( sys-devel/gettext )" + dev-qt/qttools[linguist]" FILECAPS=( -m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2 @@ -92,10 +80,9 @@ FILECAPS=( PATCHES=( "${FILESDIR}"/${PN}-1.7.0-crcs.patch - "${FILESDIR}"/${PN}-1.7.3329-lto.patch - "${FILESDIR}"/${PN}-1.7.3329-qt6.patch "${FILESDIR}"/${PN}-1.7.3351-unbundle.patch "${FILESDIR}"/${PN}-1.7.3468-cubeb-automagic.patch + "${FILESDIR}"/${PN}-1.7.3773-lto.patch ) src_unpack() { @@ -145,8 +132,7 @@ src_prepare() { cmake_src_prepare - # qt6 build doesn't support PACKAGE_MODE and need to set resources location - sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/PCSX2\";|" \ + sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/${PN}\";|" \ -i pcsx2/Frontend/CommonHost.cpp || die if [[ ${PV} != 9999 ]]; then @@ -157,7 +143,7 @@ src_prepare() { local keep=( # TODO?: rapidjson and xbyak are packaged and could be unbundlable # w/ patch, and discord-rpc be optional w/ dependency on rapidjson - cpuinfo cubeb discord-rpc glad imgui include jpgd lzma + cpuinfo cubeb demangler discord-rpc glad imgui include jpgd lzma rapidjson rapidyaml rcheevos simpleini xbyak zydis $(usev vulkan 'glslang vulkan-headers') ) @@ -167,23 +153,19 @@ src_prepare() { } src_configure() { - use qt6 || setup-wxwidgets - # for bundled glslang (bug #858374) use vulkan && append-flags -fno-strict-aliasing local mycmakeargs=( -DBUILD_SHARED_LIBS=no -DDISABLE_BUILD_DATE=yes - -DDISABLE_PCSX2_WRAPPER=yes -DDISABLE_SETCAP=yes -DENABLE_TESTS=$(usex test) - -DPACKAGE_MODE=yes - -DQT_BUILD=$(usex qt6) -DUSE_SYSTEM_LIBS=yes -DUSE_VTUNE=no -DUSE_VULKAN=$(usex vulkan) -DWAYLAND_API=$(usex wayland) + -DX11_API=yes # fails if X libs are missing even if disabled -DXDG_STD=yes # sse4.1 is the bare minimum required, -m is required at build time @@ -207,26 +189,43 @@ src_test() { } src_install() { - cmake_src_install + # package mode was removed turning cmake_src_install into a noop + newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt ${PN} - use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2 + insinto /usr/share/${PN} + doins -r "${BUILD_DIR}"/pcsx2-qt/resources + + dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,PCSX2_FAQ.pdf,debugger.txt} + newman bin/docs/PCSX2.1 ${PN}.1 + + newicon linux_various/PCSX2.xpm ${PN}.xpm + make_desktop_entry ${PN} ${PN^^} } pkg_postinst() { fcaps_pkg_postinst - local replacing_old - if [[ ${REPLACING_VERSIONS##* } ]] && - ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1 - then - replacing_old= - elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case" - elog "it is recommended to backup your save states and memory cards before use." - elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'." + local replacing= + if [[ ${REPLACING_VERSIONS##* } ]]; then + if ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1; then + replacing=old + elif ver_test ${REPLACING_VERSIONS##* } -lt 1.7.3773; then + replacing=wx + else + replacing=any + fi + fi + + if [[ ${replacing} == old ]]; then + elog + elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, notably" + elog "it is now a 64bit build using Qt6. Just-in-case it is recommended to" + elog "backup your configs, save states, and memory cards before use." + elog "The executable was also renamed from 'PCSX2' to 'pcsx2'." fi - if [[ ${PV} != 9999 && ( ! ${REPLACING_VERSIONS} || -v replacing_old ) ]]; then - [[ -v replacing_old ]] && elog + if [[ ${replacing} == @(|old) && ${PV} != 9999 ]]; then + elog elog "${PN}-1.7.x is a development branch using a nightly release model" elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting old and lacks" elog "many notable features (e.g. native 64bit builds). Given it may be a long" @@ -236,4 +235,10 @@ pkg_postinst() { elog "Please report an issue if feel a picked nightly release needs to be" elog "updated ahead of time or masked (notably for handling regressions)." fi + + if [[ ${replacing} == wx ]]; then + ewarn + ewarn "Note that wxGTK support been dropped upstream since >=${PN}-1.7.3773," + ewarn "and so USE=qt6 is gone and Qt6 is now always used." + fi } -- cgit v1.2.3