Date: Friday, August 7, 2020 @ 13:13:14 Author: alucryd Revision: 671526
upgpkg: pcsx2 1.6.0-2 Modified: pcsx2/trunk/PKGBUILD Deleted: pcsx2/trunk/pcsx2-gcc6.patch ------------------+ PKGBUILD | 22 +++++++++++--- pcsx2-gcc6.patch | 81 ----------------------------------------------------- 2 files changed, 17 insertions(+), 86 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-08-07 12:58:13 UTC (rev 671525) +++ PKGBUILD 2020-08-07 13:13:14 UTC (rev 671526) @@ -4,7 +4,7 @@ pkgname=pcsx2 pkgver=1.6.0 -pkgrel=1 +pkgrel=2 pkgdesc='A Sony PlayStation 2 emulator' arch=(x86_64) url=https://www.pcsx2.net @@ -23,17 +23,20 @@ lib32-libpulse lib32-libxml2 lib32-nvidia-cg-toolkit + lib32-ocl-icd lib32-portaudio lib32-sdl2 lib32-soundtouch - lib32-wxgtk2 + lib32-wxgtk3 ) makedepends=( cmake git + opencl-headers png++ ) -source=(git+https://github.com/PCSX2/pcsx2.git#tag=aaaf29557fe63870ede815dd6d2e48a98279ca59) +_tag=aaaf29557fe63870ede815dd6d2e48a98279ca59 +source=(git+https://github.com/PCSX2/pcsx2.git#tag=${_tag}) sha256sums=(SKIP) pkgver() { @@ -44,7 +47,7 @@ build() { cmake -S pcsx2 -B build \ - -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_LIBRARY_PATH=/usr/lib32 \ @@ -51,12 +54,21 @@ -DGAMEINDEX_DIR=/usr/share/pcsx2 \ -DPLUGIN_DIR=/usr/lib32/pcsx2 \ -DDISABLE_ADVANCE_SIMD=ON \ + -DDISABLE_BUILD_DATE=ON \ + -DDISABLE_PCSX2_WRAPPER=ON \ -DEXTRA_PLUGINS=ON \ + -DEGL_API=OFF \ -DGLSL_API=ON \ + -DGTK3_API=ON \ + -DOPENCL_API=ON \ + -DSDL2_API=ON \ -DPACKAGE_MODE=ON \ -DREBUILD_SHADER=ON \ + -DUSE_LTO=OFF \ + -DUSE_VTUNE=OFF \ -DXDG_STD=ON \ - -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config32 + -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config32 \ + -Wno-dev make -C build } Deleted: pcsx2-gcc6.patch =================================================================== --- pcsx2-gcc6.patch 2020-08-07 12:58:13 UTC (rev 671525) +++ pcsx2-gcc6.patch 2020-08-07 13:13:14 UTC (rev 671526) @@ -1,81 +0,0 @@ -diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake -index 889c0ba..b96aeff 100644 ---- a/cmake/BuildParameters.cmake -+++ b/cmake/BuildParameters.cmake -@@ -126,7 +126,7 @@ if(${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386") - - if(NOT DEFINED ARCH_FLAG) - if (DISABLE_ADVANCE_SIMD) -- set(ARCH_FLAG "-msse -msse2 -mfxsr -march=i686") -+ set(ARCH_FLAG "-msse -msse2 -mfxsr -march=i686 -mxsave") - else() - # AVX requires some fix of the ABI (mangling) (default 2) - # Note: V6 requires GCC 4.7 -diff --git a/common/include/intrin_x86.h b/common/include/intrin_x86.h -index 9665dd1..e35132e 100644 ---- a/common/include/intrin_x86.h -+++ b/common/include/intrin_x86.h -@@ -104,12 +104,8 @@ static __inline__ __attribute__((always_inline)) void __cpuidex(int CPUInfo[], c - __asm__ __volatile__("cpuid": "=a" (CPUInfo[0]), "=b" (CPUInfo[1]), "=c" (CPUInfo[2]), "=d" (CPUInfo[3]) : "a" (level), "c" (count)); - } - --static __inline__ __attribute__((always_inline)) unsigned long long _xgetbv(unsigned int index) --{ -- unsigned int eax, edx; -- __asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index)); -- return ((unsigned long long)edx << 32) | eax; --} -+#include <immintrin.h> -+#define xgetbv _xgetbv - - /*** Interrupts ***/ - #ifndef __linux__ -diff --git a/common/src/x86emitter/cpudetect.cpp b/common/src/x86emitter/cpudetect.cpp -index 717ca89..d6fb581 100644 ---- a/common/src/x86emitter/cpudetect.cpp -+++ b/common/src/x86emitter/cpudetect.cpp -@@ -16,6 +16,7 @@ - #include "PrecompiledHeader.h" - #include "cpudetect_internal.h" - #include "internal.h" -+#include "intrin_x86.h" - - using namespace x86Emitter; - -@@ -270,7 +271,7 @@ void x86capabilities::Identify() - - if((Flags2 >> 27) & 1) // OSXSAVE - { -- if((_xgetbv(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' (XMM state and YMM state are enabled by OS). -+ if((xgetbv(0) & 6) == 6) // XFEATURE_ENABLED_MASK[2:1] = '11b' (XMM state and YMM state are enabled by OS). - { - hasAVX = ( Flags2 >> 28 ) & 1; //avx - hasFMA = ( Flags2 >> 12 ) & 1; //fma -diff --git a/plugins/zzogl-pg/opengl/Util.h b/plugins/zzogl-pg/opengl/Util.h -index 27fb537..24fbe72 100644 ---- a/plugins/zzogl-pg/opengl/Util.h -+++ b/plugins/zzogl-pg/opengl/Util.h -@@ -41,8 +41,6 @@ - #include <sys/stat.h> - - #include <GL/glew.h> --#include <GL/gl.h> --#include <GL/glext.h> - #include <gtk/gtk.h> - - #include <cstring> -diff --git a/plugins/zzogl-pg/opengl/ZZGl.h b/plugins/zzogl-pg/opengl/ZZGl.h -index fd4f3b8..d5d1f17 100644 ---- a/plugins/zzogl-pg/opengl/ZZGl.h -+++ b/plugins/zzogl-pg/opengl/ZZGl.h -@@ -36,9 +36,6 @@ - - // adding glew support instead of glXGetProcAddress (thanks to scaught) - #include <GL/glew.h> --#include <GL/gl.h> --#include <GL/glext.h> --#include <GL/glx.h> - - #endif - -