From 4a318984a3dbf0a0ff67ecb03f8aef560f118b0e Mon Sep 17 00:00:00 2001 From: selfsigned Date: Fri, 8 May 2020 16:21:43 +0200 Subject: [PATCH 1/2] pcsx2: update to 1.6.0 --- srcpkgs/pcsx2/patches/gcc6.patch | 11 --- .../pcsx2/patches/wxwidgets-sdl-check.patch | 74 ------------------- srcpkgs/pcsx2/template | 15 ++-- 3 files changed, 8 insertions(+), 92 deletions(-) delete mode 100644 srcpkgs/pcsx2/patches/gcc6.patch delete mode 100644 srcpkgs/pcsx2/patches/wxwidgets-sdl-check.patch diff --git a/srcpkgs/pcsx2/patches/gcc6.patch b/srcpkgs/pcsx2/patches/gcc6.patch deleted file mode 100644 index 5c76571328e..00000000000 --- a/srcpkgs/pcsx2/patches/gcc6.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/common/src/x86emitter/cpudetect.cpp b/common/src/x86emitter/cpudetect.cpp ---- common/src/x86emitter/cpudetect.cpp -+++ common/src/x86emitter/cpudetect.cpp -@@ -16,6 +16,7 @@ - #include "PrecompiledHeader.h" - #include "cpudetect_internal.h" - #include "internal.h" -+#include "fxsrintrin.h" - - using namespace x86Emitter; - diff --git a/srcpkgs/pcsx2/patches/wxwidgets-sdl-check.patch b/srcpkgs/pcsx2/patches/wxwidgets-sdl-check.patch deleted file mode 100644 index 679a437247a..00000000000 --- a/srcpkgs/pcsx2/patches/wxwidgets-sdl-check.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 41c49faa81d4970e903e7d85616774c979e103a5 Mon Sep 17 00:00:00 2001 -From: Jonathan Li -Date: Sun, 4 Feb 2018 14:04:17 +0000 -Subject: [PATCH] cmake: Improve wxWidgets and SDL linkage check - -If wxWidgets is linked to SDL, check what version it's actually linked -against instead of assuming it's linked to SDL1.2 (which isn't true on -Fedora 27). ---- - cmake/ApiValidation.cmake | 41 ++++++++++++++++++++++++++------------- - 1 file changed, 28 insertions(+), 13 deletions(-) - -diff --git a/cmake/ApiValidation.cmake b/cmake/ApiValidation.cmake -index e7a4f99a7..f93bc67fc 100644 ---- cmake/ApiValidation.cmake -+++ cmake/ApiValidation.cmake -@@ -1,9 +1,14 @@ - set(wx_sdl_c_code " - #include - --#if (wxUSE_LIBSDL != 0) -+#if (wxUSE_LIBSDL == 0) - #error cmake_WX_SDL - #endif -+ -+int main() -+{ -+ return 0; -+} - ") - - set(gcc7_mmx_code " -@@ -83,19 +88,29 @@ function(WX_vs_SDL) - file(WRITE "${CMAKE_BINARY_DIR}/wx_sdl.c" "${wx_sdl_c_code}") - enable_language(C) - -- try_run( -- run_result_unused -- compile_result_unused -- "${CMAKE_BINARY_DIR}" -- "${CMAKE_BINARY_DIR}/wx_sdl.c" -- COMPILE_OUTPUT_VARIABLE OUT -- CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${wxWidgets_INCLUDE_DIRS}" -- ) -+ try_compile( -+ wx_linked_to_sdl -+ "${CMAKE_BINARY_DIR}" -+ "${CMAKE_BINARY_DIR}/wx_sdl.c" -+ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${wxWidgets_INCLUDE_DIRS}" -+ LINK_LIBRARIES "${wxWidgets_LIBRARIES}" -+ COPY_FILE "${CMAKE_BINARY_DIR}/wx_sdl" -+ ) -+ -+ if (NOT wx_linked_to_sdl) -+ return() -+ endif() -+ -+ execute_process( -+ COMMAND ldd "${CMAKE_BINARY_DIR}/wx_sdl" -+ COMMAND grep -c SDL2 -+ OUTPUT_VARIABLE sdl2_count -+ ) - -- if (${OUT} MATCHES "cmake_WX_SDL" AND SDL2_API) -- message(FATAL_ERROR "WxWidget is linked to SDL (wxUSE_LIBSDL) and it is likely SDL1.2. -- Unfortunately you try to build PCSX2 with SDL2 support which is not compatible -- Please use -DSDL2_API=FALSE") -+ if (SDL2_API AND sdl2_count STREQUAL "0") -+ message(FATAL_ERROR "wxWidgets is linked to SDL1.2. Please use -DSDL2_API=FALSE.") -+ elseif (NOT SDL2_API AND NOT sdl2_count STREQUAL "0") -+ message(FATAL_ERROR "wxWidgets is linked to SDL2. Please use -DSDL2_API=TRUE") - endif() - endfunction() - diff --git a/srcpkgs/pcsx2/template b/srcpkgs/pcsx2/template index 7429d012a19..afafd70dee3 100644 --- a/srcpkgs/pcsx2/template +++ b/srcpkgs/pcsx2/template @@ -4,19 +4,20 @@ lib32mode="full" nopie=yes pkgname=pcsx2 -version=1.4.0 -revision=7 +version=1.6.0 +revision=8 build_style=cmake configure_args="-DGLSL_API=1 -DSDL2_API=0 -DPACKAGE_MODE=1 -DREBUILD_SHADER=1 -DXDG_STD=1 -DPLUGIN_DIR=/usr/lib32/pcsx2 -DGAMEINDEX_DIR=/usr/share/pcsx2 -DDISABLE_ADVANCE_SIMD=1 - -DSDL2_API=TRUE" + -DSDL2_API=TRUE -DCMAKE_BUILD_TYPE=Release" hostmakedepends="pkg-config sparsehash perl" makedepends="alsa-lib-devel SDL2-devel glu-devel glew-devel libaio-devel - libcanberra-devel libjpeg-turbo-devel wxWidgets-devel portaudio-devel soundtouch-devel" + libcanberra-devel libjpeg-turbo-devel wxWidgets-devel portaudio-devel soundtouch-devel + libpcap-devel glib-devel" depends="desktop-file-utils" -short_desc="A Sony PlayStation 2 emulator" -maintainer="Orphaned " +short_desc="Sony PlayStation 2 emulator" +maintainer="Selfsigned " license="GPL-2, GPL-3, LGPL-2.1, LGPL-3" homepage="http://www.pcsx2.net" distfiles="https://github.com/PCSX2/pcsx2/archive/v${version}.tar.gz" -checksum=2c8a986e2b6514d7018f6cfd39c4f2a72229b9b4ab06ca6b1d3466dfd9c33005 +checksum=c09914020e494640f187f46d017f9d142ce2004af763b9a6c5c3a9ea09e5281c From 7cd149a989dc99cf5f9cbc351228ec99d6be723d Mon Sep 17 00:00:00 2001 From: selfsigned Date: Fri, 8 May 2020 17:24:28 +0200 Subject: [PATCH 2/2] pcsx2: fix the revision [ci skip] --- srcpkgs/pcsx2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pcsx2/template b/srcpkgs/pcsx2/template index afafd70dee3..7074b27d706 100644 --- a/srcpkgs/pcsx2/template +++ b/srcpkgs/pcsx2/template @@ -5,11 +5,11 @@ nopie=yes pkgname=pcsx2 version=1.6.0 -revision=8 +revision=1 build_style=cmake configure_args="-DGLSL_API=1 -DSDL2_API=0 -DPACKAGE_MODE=1 -DREBUILD_SHADER=1 -DXDG_STD=1 -DPLUGIN_DIR=/usr/lib32/pcsx2 -DGAMEINDEX_DIR=/usr/share/pcsx2 -DDISABLE_ADVANCE_SIMD=1 - -DSDL2_API=TRUE -DCMAKE_BUILD_TYPE=Release" + -DSDL2_API=TRUE" hostmakedepends="pkg-config sparsehash perl" makedepends="alsa-lib-devel SDL2-devel glu-devel glew-devel libaio-devel libcanberra-devel libjpeg-turbo-devel wxWidgets-devel portaudio-devel soundtouch-devel