mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-18 23:27:01 +02:00
pcsx2: update to 1.6.0 [ci skip]
This commit is contained in:
parent
a6ccdec128
commit
7d58a4ba38
3 changed files with 7 additions and 91 deletions
|
@ -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;
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
From 41c49faa81d4970e903e7d85616774c979e103a5 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Li <jonathan.li@hotmail.co.uk>
|
||||
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 <wx/setup.h>
|
||||
|
||||
-#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()
|
||||
|
|
@ -4,19 +4,20 @@ lib32mode="full"
|
|||
nopie=yes
|
||||
|
||||
pkgname=pcsx2
|
||||
version=1.4.0
|
||||
revision=7
|
||||
version=1.6.0
|
||||
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"
|
||||
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 <orphan@voidlinux.org>"
|
||||
short_desc="Sony PlayStation 2 emulator"
|
||||
maintainer="Selfsigned <selfsigned@protonmail.ch>"
|
||||
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
|
||||
|
|
Loading…
Add table
Reference in a new issue