summaryrefslogtreecommitdiff
path: root/emulators/ppsspp/files
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2020-06-27 23:24:36 +0000
committerJan Beich <jbeich@FreeBSD.org>2020-06-27 23:24:36 +0000
commitae13fdf158e11c69ec98c02a9c097d88f48de3ff (patch)
tree1cf463aca88d9c311ef41004ffef3ada14921fa8 /emulators/ppsspp/files
parentemulators/ppsspp: unbreak OLDJOY after r512863 (diff)
emulators/ppsspp: update to 1.10
- LIBRETRO option is now libretro-ppsspp port Changes: https://ppsspp.org/#news Changes: https://github.com/hrydgard/ppsspp/compare/v1.9.4...v1.10 Reported by: GitHub (watch releases)
Diffstat (limited to 'emulators/ppsspp/files')
-rw-r--r--emulators/ppsspp/files/patch-ext_glslang_CMakeLists.txt26
-rw-r--r--emulators/ppsspp/files/patch-ext_glslang_glslang_Include_PoolAlloc.h25
-rw-r--r--emulators/ppsspp/files/patch-system-libpng1662
3 files changed, 0 insertions, 113 deletions
diff --git a/emulators/ppsspp/files/patch-ext_glslang_CMakeLists.txt b/emulators/ppsspp/files/patch-ext_glslang_CMakeLists.txt
deleted file mode 100644
index 26a7999cc14e..000000000000
--- a/emulators/ppsspp/files/patch-ext_glslang_CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-CMake Error at /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:137 (message):
- Could NOT find PythonInterp: Found unsuitable version "2.7.16", but
- required is at least "3" (found /usr/local/bin/python)
-Call Stack (most recent call first):
- /usr/local/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:376 (_FPHSA_FAILURE_MESSAGE)
- /usr/local/share/cmake/Modules/FindPythonInterp.cmake:160 (FIND_PACKAGE_HANDLE_STANDARD_ARGS)
- ext/glslang/CMakeLists.txt:120 (find_package)
-
---- ext/glslang/CMakeLists.txt.orig 2019-06-18 08:00:46 UTC
-+++ ext/glslang/CMakeLists.txt
-@@ -114,15 +114,6 @@ function(glslang_set_link_args TARGET)
- endif()
- endfunction(glslang_set_link_args)
-
--# CMake needs to find the right version of python, right from the beginning,
--# otherwise, it will find the wrong version and fail later
--if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External)
-- find_package(PythonInterp 3 REQUIRED)
--endif()
--
--# We depend on these for later projects, so they should come first.
--add_subdirectory(External)
--
- if(NOT TARGET SPIRV-Tools-opt)
- set(ENABLE_OPT OFF)
- endif()
diff --git a/emulators/ppsspp/files/patch-ext_glslang_glslang_Include_PoolAlloc.h b/emulators/ppsspp/files/patch-ext_glslang_glslang_Include_PoolAlloc.h
deleted file mode 100644
index 834ab36ebeb6..000000000000
--- a/emulators/ppsspp/files/patch-ext_glslang_glslang_Include_PoolAlloc.h
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/KhronosGroup/glslang/commit/24b3e8384e93
-
-In file included from Common/Vulkan/VulkanContext.cpp:28:
-In file included from ext/glslang/SPIRV/GlslangToSpv.h:42:
-In file included from ext/glslang/SPIRV/SpvTools.h:47:
-In file included from ext/glslang/SPIRV/../glslang/MachineIndependent/localintermediate.h:42:
-In file included from ext/glslang/SPIRV/../glslang/MachineIndependent/../Include/intermediate.h:55:
-In file included from ext/glslang/SPIRV/../glslang/MachineIndependent/../Include/../Include/Common.h:108:
-ext/glslang/SPIRV/../glslang/MachineIndependent/../Include/PoolAlloc.h:307:54: error: 'operator=' is a private member of 'glslang::TPoolAllocator'
- void setAllocator(TPoolAllocator* a) { allocator = *a; }
- ~~~~~~~~~ ^ ~~
-ext/glslang/SPIRV/../glslang/MachineIndependent/../Include/PoolAlloc.h:244:21: note: declared private here
- TPoolAllocator& operator=(const TPoolAllocator&); // don't allow assignment operator
- ^
-
---- ext/glslang/glslang/Include/PoolAlloc.h.orig 2019-06-18 08:00:46 UTC
-+++ ext/glslang/glslang/Include/PoolAlloc.h
-@@ -304,7 +304,6 @@ class pool_allocator { (public)
- size_type max_size() const { return static_cast<size_type>(-1) / sizeof(T); }
- size_type max_size(int size) const { return static_cast<size_type>(-1) / size; }
-
-- void setAllocator(TPoolAllocator* a) { allocator = *a; }
- TPoolAllocator& getAllocator() const { return allocator; }
-
- protected:
diff --git a/emulators/ppsspp/files/patch-system-libpng16 b/emulators/ppsspp/files/patch-system-libpng16
deleted file mode 100644
index ea5f2b052150..000000000000
--- a/emulators/ppsspp/files/patch-system-libpng16
+++ /dev/null
@@ -1,62 +0,0 @@
-Make build glue accept libpng 1.6.x and don't hardcode suffix
-
---- CMakeLists.txt.orig 2018-10-27 18:56:20 UTC
-+++ CMakeLists.txt
-@@ -663,9 +663,10 @@ else()
- set(LIBZIP_LIBRARY libzip)
- endif()
-
--# FindPNG does a few things we don't want. So do it ourselves. Fixed to libpng17
--find_path(PNG_PNG_INCLUDE_DIR NAMES "libpng17/png.h")
--find_library(PNG_LIBRARY NAMES png17 libpng17)
-+find_package(PkgConfig)
-+pkg_check_modules(PNG libpng>=1.6)
-+set(PNG_LIBRARY ${PNG_LIBRARIES})
-+set(PNG_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIRS})
- find_package(PackageHandleStandardArgs)
- find_package_handle_standard_args(PNG REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR)
- if (PNG_FOUND)
---- Core/Debugger/WebSocket/GPUBufferSubscriber.cpp.orig 2018-10-27 09:29:42 UTC
-+++ Core/Debugger/WebSocket/GPUBufferSubscriber.cpp
-@@ -17,7 +17,7 @@
-
- #include <algorithm>
- #ifndef USING_QT_UI
--#include <libpng17/png.h>
-+#include "png.h"
- #include <zlib.h>
- #endif
- #include "data/base64.h"
---- Core/Screenshot.cpp.orig 2018-10-27 09:29:42 UTC
-+++ Core/Screenshot.cpp
-@@ -21,7 +21,7 @@
- #ifdef USING_QT_UI
- #include <QtGui/QImage>
- #else
--#include <libpng17/png.h>
-+#include "png.h"
- #include "ext/jpge/jpge.h"
- #endif
-
---- Core/TextureReplacer.cpp.orig 2018-10-27 09:29:42 UTC
-+++ Core/TextureReplacer.cpp
-@@ -18,7 +18,7 @@
- #ifdef USING_QT_UI
- #include <QtGui/QImage>
- #else
--#include <libpng17/png.h>
-+#include "png.h"
- #endif
-
- #include <algorithm>
---- ext/native/image/png_load.cpp.orig 2018-10-27 09:29:42 UTC
-+++ ext/native/image/png_load.cpp
-@@ -5,7 +5,7 @@
- #ifdef USING_QT_UI
- #include <QtGui/QImage>
- #else
--#include "libpng17/png.h"
-+#include "png.h"
- #endif
-
- #include "png_load.h"