Merge remote-tracking branch 'origin/master' into core-updates

1 files changed, 35 insertions, 19 deletions

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 5bf1be0af3..74f3f09926 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -285,7 +285,7 @@ older games.")
 (define-public qtmips
   (package
     (name "qtmips")
-    (version "0.7.3")
+    (version "0.7.5")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -294,7 +294,7 @@ older games.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1khvwgqz4h6q6mhbbq0yx43ajz8gx9wmwzs8784vmfrglndbxgax"))))
+                "1fal7a8y5g0rqqjrk795jh1l50ihz01ppjnrfjrk9vkjbd59szbp"))))
     (build-system cmake-build-system)
     (arguments
      '(#:phases
@@ -2083,7 +2083,7 @@ framework based on QEMU.")
 (define-public ppsspp
   (package
     (name "ppsspp")
-    (version "1.10.3")
+    (version "1.11.3")
     (source
      (origin
        (method git-fetch)
@@ -2091,7 +2091,7 @@ framework based on QEMU.")
              (url "https://github.com/hrydgard/ppsspp")
              (commit (string-append "v" version))))
        (sha256
-        (base32 "0znxlbj6cfw7gn0naay0mzhc0k5saw8nrwpspcn7gap1023p06w2"))
+        (base32 "1dpxnwvl6jq7z67lbjws4lqc1bxc31xi6ddlmg5n3aig008yi2fp"))
        (file-name (git-file-name name version))
        (patches
         (search-patches "ppsspp-disable-upgrade-and-gold.patch"))
@@ -2102,16 +2102,16 @@ framework based on QEMU.")
            ;; There are still a number of external sources, that we don't
            ;; remove here.  Some may be packaged, others are not.
            ;; First, we patch existing sources to include the right headers.
-           (substitute* (append (list "ext/native/thin3d/vulkan_utils.cpp"
-                                      "ext/native/thin3d/thin3d_vulkan.cpp")
-                                (find-files "Common" ".*\\.(h|cpp)")
+           (substitute* (append (find-files "Common" ".*\\.(h|cpp)")
                                 (find-files "Core" ".*\\.(h|cpp)")
                                 (find-files "GPU" ".*\\.(h|cpp)")
                                 (find-files "SDL" ".*\\.(h|cpp)")
                                 (find-files "UI" ".*\\.(h|cpp)"))
              ;; These headers are all hard-coded in the original source.
              (("ext/cityhash/") "")
-             (("ext/glslang/") "")
+             (("ext/glslang/glslang/") "glslang/")
+             (("ext/glslang/") "glslang/")
+             (("ext/miniupnp/") "")
              (("ext/SPIRV-Cross/") "spirv_cross/")
              (("ext/vulkan/") "vulkan/")
              (("ext/xxhash.h") "xxhash.h")
@@ -2134,7 +2134,12 @@ framework based on QEMU.")
              ;; Don't search for cityhash/xxhash, we already have them.
              (("add_library\\((city|xx)hash STATIC") "if()\nendif(")
              (("ext/xxhash\\.[ch]") "")
-             (("ext/native/ext/cityhash/.*\\.(cpp|h)") "")
+             (("ext/cityhash/.*\\.(cpp|h)") "")
+             (("if\\(USE_MINIUPNPC\\)" all)
+              (string-append all "
+find_package(miniupnpc)
+target_link_libraries(${CoreLibName} miniupnpc ${LDLIBS})
+elseif(FALSE)"))
              ;; Link all of spirv-cross.
              (("spirv-cross-glsl" all)
               (string-append all
@@ -2147,12 +2152,12 @@ framework based on QEMU.")
              (("add_subdirectory\\(SPIRV-Cross-build\\)") ""))
            ;; Finally, we can delete the bundled sources.
            (for-each delete-file-recursively
-                     '("ext/cmake"
+                     '("MoltenVK"
+                       "ext/cmake"
                        "ext/glew"
                        "ext/glslang" "ext/glslang-build"
-                       "ext/native/ext/cityhash"
-                       "ext/native/ext/libpng17"
-                       "ext/native/ext/libzip"
+                       "ext/miniupnp" "ext/miniupnp-build"
+                       "ext/native"
                        "ext/snappy"
                        "ext/SPIRV-Cross" "ext/SPIRV-Cross-build"
                        "ext/vulkan"
@@ -2175,6 +2180,7 @@ framework based on QEMU.")
        ("libpng" ,libpng)
        ("libzip" ,libzip)
        ("mesa" ,mesa)
+       ("miniupnpc" ,miniupnpc)
        ("sdl2" ,sdl2)
        ("snappy" ,snappy)
        ("spirv-cross" ,spirv-cross)
@@ -2185,24 +2191,24 @@ framework based on QEMU.")
        ;; TODO: unbundle armips.
        ("armips-source" ,(package-source armips))
        ("lang"
-        ,(let ((commit "1c64b8fbd3cb6bd87935eb53f302f7de6f86e209"))
+        ,(let ((commit "6bd5b4bc983917ea8402f73c726b46e36f3de0b4"))
            (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/hrydgard/ppsspp-lang")
                    (commit commit)))
              (sha256
-              (base32 "0rprn3yd8xfrvi0fm62sgpqa8n73jk7zmlscp8cp0h2fawqpiamd"))
+              (base32 "08npr3a4xskf85gnlxidl4ksc3rhc7m5rgnj7vsbjvhvw5ap02qx"))
              (file-name (git-file-name "ppsspp-lang" commit)))))
        ("tests"
-        ,(let ((commit "328b839c7243e7f733f9eae88d059485e3d808e7"))
+        ,(let ((commit "1047400eaec6bcbdb2a64d326375ef6a6617c4ac"))
            (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/hrydgard/pspautotests")
                    (commit commit)))
              (sha256
-              (base32 "1gj1kr5ijxrqwvz7c41phskjr70ndp8iz0gr8c3xxsd8p9z5gdvm"))
+              (base32 "0nxv1lskcr8zbg6nrfai21mxsw0n5vaqhbsa41c3cxfyx5c4w2pg"))
              (file-name (git-file-name "pspautotests" commit)))))))
     (arguments
      `(#:out-of-source? #f
@@ -2225,13 +2231,23 @@ framework based on QEMU.")
              (copy-recursively (assoc-ref inputs "lang")
                                "assets/lang")
              #t))
+         (add-after 'unpack 'fix-unittest-build
+           (lambda _
+             (substitute* "CMakeLists.txt"
+               (("unittest/TestVertexJit.cpp" all)
+                (string-append all " unittest/TestShaderGenerators.cpp")))
+             (substitute* "unittest/TestVertexJit.cpp"
+               (("#include \"unittest/UnitTest.h\"" all)
+                (string-append all "\n#include <cmath>")))
+             #t))
          (replace 'check
            (lambda _
              (for-each
               (lambda (t) (invoke "./unitTest" t))
               '("Arm64Emitter" "ArmEmitter" "X64Emitter" "VertexJit" "Asin"
-                "SinCos" "VFPUSinCos" "MathUtil" "Parsers" "Jit"
-                "MatrixTranspose" "ParseLBN" "QuickTexHash" "CLZ" "MemMap"))
+                "SinCos" #|"VFPUSinCos" SIGSEGV|# "MathUtil" "Parsers" "Jit"
+                "MatrixTranspose" "ParseLBN" "QuickTexHash" "CLZ"
+                #|"ShaderGenerators"|#))
              (invoke "python3" "test.py" "-g")
              #t))
          (replace 'install