summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorxdavidwu2021-01-18 13:21:27 +0800
committerxdavidwu2021-01-18 13:21:27 +0800
commit4d5bab4cc3bbd95c008b918996682fe15d664bb9 (patch)
tree79f0aadd78618a65bc37505934abd087db7bd0fd
parent950c1048ab57f2bac4f727b63a9db51fd2191b40 (diff)
downloadaur-ppsspp-git.tar.gz
remove O2 patch
they now O2 by default see: https://github.com/hrydgard/ppsspp/pull/13935
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
-rw-r--r--ppsspp-flags.patch33
3 files changed, 1 insertions, 40 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 98f0f0cc884..50ac007334d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -30,7 +30,6 @@ pkgbase = ppsspp-git
source = git+https://github.com/hrydgard/miniupnp.git
source = ppsspp.desktop
source = ppsspp-qt.desktop
- source = ppsspp-flags.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
@@ -43,7 +42,6 @@ pkgbase = ppsspp-git
sha256sums = SKIP
sha256sums = 77a88e75f3c090856442b11c8d3f24ed95cc9ca0da1e3f22a40b700b30a3a7b7
sha256sums = 7456207ba3759ee93709e25b7bfce5b560a8cb432e2d578ef0f98cb6da6c4d15
- sha256sums = 6694643d96dae673f01555637139468eb277f3379afbcceccad3f7e0ae670278
pkgname = ppsspp-git
depends = glew
diff --git a/PKGBUILD b/PKGBUILD
index 24a17eff3b6..7a953fe3e7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -49,7 +49,6 @@ source=(
git+https://github.com/hrydgard/miniupnp.git
ppsspp.desktop
ppsspp-qt.desktop
- ppsspp-flags.patch
)
sha256sums=('SKIP'
'SKIP'
@@ -62,8 +61,7 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'77a88e75f3c090856442b11c8d3f24ed95cc9ca0da1e3f22a40b700b30a3a7b7'
- '7456207ba3759ee93709e25b7bfce5b560a8cb432e2d578ef0f98cb6da6c4d15'
- '6694643d96dae673f01555637139468eb277f3379afbcceccad3f7e0ae670278')
+ '7456207ba3759ee93709e25b7bfce5b560a8cb432e2d578ef0f98cb6da6c4d15')
pkgver() {
cd ppsspp
@@ -74,8 +72,6 @@ pkgver() {
prepare() {
cd ppsspp
- patch -Np1 -i ../ppsspp-flags.patch
-
for submodule in assets/lang ext/glslang ffmpeg; do
git submodule init ${submodule}
git config submodule.${submodule}.url ../ppsspp-${submodule#*/}
diff --git a/ppsspp-flags.patch b/ppsspp-flags.patch
deleted file mode 100644
index 5aa492f2566..00000000000
--- a/ppsspp-flags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 19038c88a436..bf50f5cf52fb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -195,11 +195,11 @@ if(NOT MSVC)
-
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -D_DEBUG")
- set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
-- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -D_NDEBUG")
-+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -D_NDEBUG")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -D_DEBUG")
- set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
-- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -D_NDEBUG")
-+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -D_NDEBUG")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
- #TODO: Remove this and include the file properly everywhere it makes sense
- # First step is too use the macros everywhere
-@@ -509,10 +509,10 @@ include_directories(ext/cityhash)
-
- if (NOT MSVC)
- # These can be fast even for debug.
-- set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O3")
-- set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O3")
-+ set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O2")
-+ set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O2")
- if(NOT ZLIB_FOUND)
-- set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O3")
-+ set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O2")
- endif()
- endif()
-
-