Date: Monday, January 17, 2022 @ 16:09:56 Author: alucryd Revision: 1107784
upgpkg: pcsx2 1.7.2243-1 Added: pcsx2/trunk/pcsx2-system-libs.patch Modified: pcsx2/trunk/PKGBUILD -------------------------+ PKGBUILD | 43 ++++++++++++++++++++++++------------------- pcsx2-system-libs.patch | 25 +++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 19 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-17 15:13:41 UTC (rev 1107783) +++ PKGBUILD 2022-01-17 16:09:56 UTC (rev 1107784) @@ -3,7 +3,7 @@ # Contributor: vEX <[email protected]> pkgname=pcsx2 -pkgver=1.7.2101 +pkgver=1.7.2243 pkgrel=1 pkgdesc='A Sony PlayStation 2 emulator' arch=(x86_64) @@ -18,23 +18,18 @@ gcc-libs glibc libaio - libasound.so libcap libfmt.so - libfreetype.so libgdk-3.so libgdk_pixbuf-2.0.so - libgio-2.0.so - libGLEW.so libgl libglib-2.0.so libgobject-2.0.so libgtk-3.so - libharfbuzz.so libpcap.so libpng - libportaudio.so libpulse.so + libryml.so libsamplerate.so libudev.so libx11 @@ -41,7 +36,6 @@ libxcb libxml2 libxrandr - libyaml-cpp.so sdl2 soundtouch wxgtk3 @@ -52,23 +46,33 @@ makedepends=( cmake git + glslang ninja png++ + vulkan-headers ) -_tag=bb55c320c1427a4fe593b77386c2cea8d301e1ca +_tag=8db0b52821fafabcc556b3669e217bc9c91e5805 source=( git+https://github.com/PCSX2/pcsx2.git#tag=${_tag} + git+https://github.com/mozilla/cubeb.git + git+https://github.com/KhronosGroup/glslang.git + git+https://github.com/ocornut/imgui.git git+https://github.com/rtissera/libchdr.git + pcsx2-system-libs.patch ) -b2sums=( - SKIP - SKIP -) +b2sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + '29c8f279f96c67b3a35eb39440c6dfa134ef1cda36026f69f7b9931c59700e61431d7b38002bd811f6e38089296128a16c737e1c0eb2120b342790089c1e4017') install=pcsx2.install prepare() { - cd pcsx2/3rdparty - for submodule in libchdr/libchdr; do + cd pcsx2 + patch -Np1 -i ../pcsx2-system-libs.patch + cd 3rdparty + for submodule in cubeb/cubeb glslang/glslang imgui/imgui libchdr/libchdr; do git submodule init ${submodule} git config submodule.${submodule}.url ../../${submodule#*/} git submodule update ${submodule} @@ -77,7 +81,6 @@ pkgver() { cd pcsx2 - git describe --tags | sed 's/^v//' } @@ -85,6 +88,8 @@ cmake -S pcsx2 -B build -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ + -DCUBEB_API=ON \ -DDISABLE_ADVANCE_SIMD=ON \ -DDISABLE_BUILD_DATE=ON \ -DDISABLE_PCSX2_WRAPPER=ON \ @@ -92,17 +97,17 @@ -DENABLE_TESTS=OFF \ -DLTO_PCSX2_CORE=ON \ -DPACKAGE_MODE=ON \ - -DSDL2_API=ON \ -DUSE_SYSTEM_YAML=ON \ -DUSE_VTUNE=OFF \ + -DUSE_VULKAN=ON \ -DXDG_STD=ON \ -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \ -Wno-dev - ninja -C build + cmake --build build } package() { - DESTDIR="${pkgdir}" ninja -C build install + DESTDIR="${pkgdir}" cmake --install build } # vim: ts=2 sw=2 et: Added: pcsx2-system-libs.patch =================================================================== --- pcsx2-system-libs.patch (rev 0) +++ pcsx2-system-libs.patch 2022-01-17 16:09:56 UTC (rev 1107784) @@ -0,0 +1,25 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 1e4e07333..2e31bcf99 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -249,7 +249,6 @@ add_subdirectory(3rdparty/imgui EXCLUDE_FROM_ALL) + + if(USE_VULKAN) + add_subdirectory(3rdparty/glslang EXCLUDE_FROM_ALL) +- add_subdirectory(3rdparty/vulkan-headers EXCLUDE_FROM_ALL) + endif() + + if(CUBEB_API) +diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt +index 69a2728f3..5a9857d42 100644 +--- a/common/CMakeLists.txt ++++ b/common/CMakeLists.txt +@@ -135,7 +135,7 @@ target_sources(common PRIVATE + + if(USE_VULKAN) + target_link_libraries(common PUBLIC +- Vulkan-Headers glslang ++ glslang + ) + target_sources(common PRIVATE + Vulkan/ShaderCache.cpp Property changes on: pcsx2/trunk/pcsx2-system-libs.patch ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property
