diff options
| -rw-r--r-- | emulators/ppsspp-qt5/Makefile | 2 | ||||
| -rw-r--r-- | emulators/ppsspp/Makefile | 10 | ||||
| -rw-r--r-- | emulators/ppsspp/distinfo | 18 | ||||
| -rw-r--r-- | emulators/ppsspp/files/patch-ext_glslang_CMakeLists.txt | 26 |
4 files changed, 41 insertions, 15 deletions
diff --git a/emulators/ppsspp-qt5/Makefile b/emulators/ppsspp-qt5/Makefile index 81d25c2ae14f..d20236b2cd7a 100644 --- a/emulators/ppsspp-qt5/Makefile +++ b/emulators/ppsspp-qt5/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../ppsspp diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile index 930317454e4b..e9204a05891f 100644 --- a/emulators/ppsspp/Makefile +++ b/emulators/ppsspp/Makefile @@ -2,8 +2,8 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v -DISTVERSION?= 1.8.0 -PORTREVISION?= 2 +DISTVERSION?= 1.9.1 +PORTREVISION?= 0 CATEGORIES= emulators # XXX Get from Debian once #697821 lands MASTER_SITES= https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage @@ -27,9 +27,9 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils USE_GITHUB= yes GH_ACCOUNT= hrydgard -GH_TUPLE?= hrydgard:glslang:9983f99e:glslang/ext/glslang \ - hrydgard:${PORTNAME}-lang:18e0d46:lang/assets/lang \ - KhronosGroup:SPIRV-Cross:be7425e:SPIRV/ext/SPIRV-Cross \ +GH_TUPLE?= hrydgard:glslang:7.11.3214-63-gf9d08a25:glslang/ext/glslang \ + hrydgard:${PORTNAME}-lang:bfc3a51:lang/assets/lang \ + KhronosGroup:SPIRV-Cross:2019-05-20-60-ga1f7c8dc:SPIRV/ext/SPIRV-Cross \ Kingcom:armips:v0.10.0-28-g7885552:armips/ext/armips CONFLICTS_INSTALL= ${PORTNAME}-* diff --git a/emulators/ppsspp/distinfo b/emulators/ppsspp/distinfo index dd2082df1953..6db35c49d0de 100644 --- a/emulators/ppsspp/distinfo +++ b/emulators/ppsspp/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1552550450 +TIMESTAMP = 1569444466 SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b SIZE (ppsspp.1) = 1598 -SHA256 (hrydgard-ppsspp-v1.8.0_GH0.tar.gz) = a7011feb0480a352d60e6a3c939d88d4d2e3a2e76620886b183aa2cb36f910de -SIZE (hrydgard-ppsspp-v1.8.0_GH0.tar.gz) = 19636576 -SHA256 (hrydgard-glslang-9983f99e_GH0.tar.gz) = cf5cef6113b13461881c6d1a962900b4f2c1b9d53db723620034d1b61f9c4d4c -SIZE (hrydgard-glslang-9983f99e_GH0.tar.gz) = 2493444 -SHA256 (hrydgard-ppsspp-lang-18e0d46_GH0.tar.gz) = 660424581e8c9c7d454534c696c2d4737336d7ef827ae65799eb3fb0926536ae -SIZE (hrydgard-ppsspp-lang-18e0d46_GH0.tar.gz) = 537066 -SHA256 (KhronosGroup-SPIRV-Cross-be7425e_GH0.tar.gz) = a5a06eee313583289f697689a3b79579b6f3dc40c766520e905047dfa94aade1 -SIZE (KhronosGroup-SPIRV-Cross-be7425e_GH0.tar.gz) = 537750 +SHA256 (hrydgard-ppsspp-v1.9.1_GH0.tar.gz) = 151aeeca177216de937d3e6b028df902a73b48b3555d92c91fe14fb16ae3deaf +SIZE (hrydgard-ppsspp-v1.9.1_GH0.tar.gz) = 17005911 +SHA256 (hrydgard-glslang-7.11.3214-63-gf9d08a25_GH0.tar.gz) = baf58cbd5a8614d2b0a446893fa201e7ccdb31e43322f55e1ad1dac7861a0893 +SIZE (hrydgard-glslang-7.11.3214-63-gf9d08a25_GH0.tar.gz) = 2947747 +SHA256 (hrydgard-ppsspp-lang-bfc3a51_GH0.tar.gz) = 1c57ade5c3f44a07f7fc128258a6c3e40edf8426d90149e9d0a1a3d4380ff490 +SIZE (hrydgard-ppsspp-lang-bfc3a51_GH0.tar.gz) = 549625 +SHA256 (KhronosGroup-SPIRV-Cross-2019-05-20-60-ga1f7c8dc_GH0.tar.gz) = 2a07055247a14c0112d6e35634de93f832ac88e08828d9147e3a20d8d46600b2 +SIZE (KhronosGroup-SPIRV-Cross-2019-05-20-60-ga1f7c8dc_GH0.tar.gz) = 816026 SHA256 (Kingcom-armips-v0.10.0-28-g7885552_GH0.tar.gz) = 040a8d01b1c0e65b77ede9dd6713b6f6290346a29d300138454335362a396d6c SIZE (Kingcom-armips-v0.10.0-28-g7885552_GH0.tar.gz) = 197207 diff --git a/emulators/ppsspp/files/patch-ext_glslang_CMakeLists.txt b/emulators/ppsspp/files/patch-ext_glslang_CMakeLists.txt new file mode 100644 index 000000000000..26a7999cc14e --- /dev/null +++ b/emulators/ppsspp/files/patch-ext_glslang_CMakeLists.txt @@ -0,0 +1,26 @@ +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() |