;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
-;;; Copyright © 2015, 2016 Sou Bunnbu <iyzsong@gmail.com>
+;;; Copyright © 2015, 2016, 2021 Sou Bunnbu <iyzsong@member.fsf.org>
;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015, 2018 David Thompson <dthompson2@worcester.edu>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
-;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2017, 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 David Wilson <david@daviwil.com>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2020 Christopher Howard <christopher@librehacker.com>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix svn-download)
+ #:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
#:use-module (gnu packages assembly)
#:use-module (gnu packages audio)
+ #:use-module (gnu packages autogen)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages boost)
#:use-module (gnu packages fonts)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages fribidi)
#:use-module (gnu packages game-development)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
- #:use-module (gnu packages imagemagick)
#:use-module (gnu packages libedit)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
(license license:gpl2)))
;; Building from recent Git because the official 5.0 release no longer builds.
+;; Following commits and revision numbers of beta versions listed at
+;; https://dolphin-emu.org/download/.
(define-public dolphin-emu
- (let ((commit "a9745400ec5cea7e55d94955afbdc44d1a4982d1")
- (revision "7"))
+ (let ((commit "a34823df61df65168aa40ef5e82e44defd4a0138")
+ (revision "13178"))
(package
(name "dolphin-emu")
(version (git-version "5.0" revision commit))
#t))
(sha256
(base32
- "0ic08ii4vlqlmk2wkfc99jiy6nji2wfq56r7slj23wgvhznnaabk"))))
+ "0j6hnj60iai366kl0kdbn1jkwc183l02g65mp2vq4qb2yd4399l1"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f
(copy-file "font_western.bin" "../Data/Sys/GC/font_western.bin")
(chdir "..")
(substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp"
- (("\"vulkan\", 1") (string-append "\"vulkan\"")))
- (substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp"
- (("\"vulkan\"") (string-append "\"" libvulkan "\"")))
- (substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp"
- (("Common::DynamicLibrary::GetVersionedFilename") ""))
+ (("\"vulkan\", 1") (string-append "\"vulkan\""))
+ (("\"vulkan\"") (string-append "\"" libvulkan "\""))
+ (("Common::DynamicLibrary::GetVersionedFilename") ""))
#t))))
;; The FindGTK2 cmake script only checks hardcoded directories for
older games.")
(license license:gpl2+)))
+(define-public qtmips
+ (package
+ (name "qtmips")
+ (version "0.7.5")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/cvut/QtMips")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1fal7a8y5g0rqqjrk795jh1l50ihz01ppjnrfjrk9vkjbd59szbp"))))
+ (build-system cmake-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (invoke "qmake"
+ (string-append "PREFIX=" (assoc-ref outputs "out"))
+ "qtmips.pro")))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (substitute* "tests/test.sh"
+ (("qtchooser.*") ""))
+ (substitute* '("tests/cpu_trap/test.sh"
+ "tests/registers/test.sh")
+ (("sub-qtmips_cli") "qtmips_cli"))
+ (if tests?
+ (invoke "tests/run-all.sh")
+ #t)))
+ (replace 'install
+ ;; There is no install target.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (apps (string-append out "/share/applications"))
+ (icons (string-append out "/share/icons/hicolor")))
+ (install-file "qtmips_gui/qtmips_gui" bin)
+ (install-file "qtmips_cli/qtmips_cli" bin)
+ (install-file "data/qtmips.desktop" apps)
+ (install-file "data/icons/qtmips_gui.svg"
+ (string-append icons "/scalable/apps"))
+ (install-file "data/icons/qtmips_gui.png"
+ (string-append icons "/48x48/apps"))
+ #t))))
+ #:tests? #f)) ; test suite wants mips toolchain
+ (inputs
+ `(("elfutils" ,elfutils)
+ ("qtbase" ,qtbase)))
+ (home-page "https://github.com/cvut/QtMips")
+ (synopsis "MIPS CPU emulator")
+ (description "This package contains a MIPS CPU emulator. The simulator
+accepts ELF statically linked executables compiled for 32-bit big-endian
+MIPS target, targeting mips-linux-gnu or mips-elf.")
+ (license license:gpl2+))) ; License file says GPL3
+
(define-public emulation-station
;; No release for a long time, new commits fix build issues
(let ((commit "9cc42adff67946175d2b7e25c6ae69cc374e98a0")
(define-public mednafen
(package
(name "mednafen")
- (version "1.24.3")
+ (version "1.26.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://mednafen.github.io/releases/files/"
"mednafen-" version ".tar.xz"))
(sha256
- (base32 "03zplcfvmnnv7grhacmr1zy789pb2wda36wylmzmar23g0zqbsix"))))
+ (base32 "1x7xhxjhwsdbak8l0iyb497f043xkhibk73w96xck4j2bk10fac4"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(define-public mgba
(package
(name "mgba")
- (version "0.8.2")
+ (version "0.9.1")
(source
(origin
(method git-fetch)
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0dlwhn3hrpaqnl5hjs53y8j2i16idxrg3gy688gcwrc9z1a6bkn2"))
+ (base32 "163azad5y4zxwzxyrb481rwfc2p86v99pf7nvdr6bavzq98x2z8h"))
(modules '((guix build utils)))
(snippet
;; Make sure we don't use the bundled software.
(native-inputs `(("pkg-config" ,pkg-config)
("qttools" ,qttools)))
(inputs `(("ffmpeg" ,ffmpeg)
- ("imagemagick" ,imagemagick)
("libedit" ,libedit)
("libelf" ,libelf)
("libepoxy" ,libepoxy)
(define-public sameboy
(package
(name "sameboy")
- (version "0.13.4")
+ (version "0.13.6")
(source
(origin
(method git-fetch)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "00kdi4h2mgcfp86lbshnlax2p9rzdamkva71v27akarp6lixj5d1"))))
+ (base32 "04w8lybi7ssnax37ka4qw7pmcm7cgnmk90p9m73zbyp5chgpqqzc"))))
(build-system gnu-build-system)
(native-inputs
`(("rgbds" ,rgbds)
emulation community. It provides highly accurate emulation.")
(license license:gpl2+)))
+(define-public libretro-lowresnx
+ (let ((commit "743ab43a6c4a13e0d5363b0d25ac12c7511c6581")
+ (revision "1"))
+ (package
+ (name "libretro-lowresnx")
+ (version (git-version "1.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/timoinutilis/lowres-nx")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0r15kb5p5s2jwky6zy4v1j9i95i4rz36p9wxg0g6xdjksf04b5cf"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; no tests
+ #:make-flags (list "-C" "platform/LibRetro"
+ (string-append "CC=" ,(cc-for-target)))
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure) ; no configure script
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (libretrodir (string-append out "/lib/libretro")))
+ (install-file "platform/LibRetro/lowresnx_libretro.so"
+ libretrodir)
+ #t))))))
+ (home-page "https://lowresnx.inutilis.com/")
+ (synopsis "Libretro core for LowRES NX")
+ (description "LowRES NX is a simulated retro game console, which can be
+programmed in the classic BASIC language. This package provides a libretro
+core allowing the lowRES NX programs to be used with libretro frontends such
+as RetroArch.")
+ (license license:zlib))))
+
(define-public retroarch
(package
(name "retroarch")
- (version "1.8.1")
+ (version "1.9.0")
(source
(origin
(method git-fetch)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0y7rcpz7psf8k3agsrq277jdm651vbnn9xpqvmj2in1a786idya7"))
+ (base32 "1n0dcv85vqrdr79psnf009hi4r2mvsgsjbghrrc9pm5g7ywwwcvp"))
(patches
- (search-patches "retroarch-disable-online-updater.patch"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Don't suggest using the Online Updater if available: it never
- ;; is. This disables translation of this particular message.
- (substitute* (find-files "menu/drivers" "\\.c$")
- (("msg_hash_to_str\\(MSG_MISSING_ASSETS\\)")
- "\"Warning: Missing assets, go get some\""))
- #t))))
+ (search-patches "retroarch-LIBRETRO_DIRECTORY.patch"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
'("--enable-neon" "--enable-floathard")
'())
(string-append "--prefix=" out)
- (string-append "--global-config-dir=" etc)
+ ;; Non-free software are available through the core updater,
+ ;; disable it. See <https://issues.guix.gnu.org/38360>.
+ "--disable-update_cores"
"--disable-builtinminiupnpc")))))))
(inputs
`(("alsa-lib" ,alsa-lib)
`(("pkg-config" ,pkg-config)
("wayland-protocols" ,wayland-protocols)
("which" ,which)))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "LIBRETRO_DIRECTORY")
+ (separator #f) ; single entry
+ (files '("lib/libretro")))))
(home-page "https://www.libretro.com/")
(synopsis "Reference frontend for the libretro API")
(description
(define-public scummvm
(package
(name "scummvm")
- (version "2.1.2")
+ (version "2.2.0")
(source
(origin
(method url-fetch)
- (uri (string-append "http://www.scummvm.org/frs/scummvm/" version
+ (uri (string-append "https://downloads.scummvm.org/frs/scummvm/" version
"/scummvm-" version ".tar.xz"))
(sha256
- (base32 "1c4fz1nfg0nqnqx9iipayhzcsiqdmfxm2i95nw9dbhshhsdnrhf4"))))
+ (base32 "11vknasm5dna2vqr6gk343qynh7nhsq3kf60zayarn1vb5z6as8l"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ;require "git"
#:configure-flags (list "--enable-release") ;for optimizations
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-build
- ;; XXX: The following works around a build failure introduced when
- ;; Fluidsynth was updated to version 2.1. It has been applied
- ;; upstream as 68758a879e0c8ecc0d40962516d4e808aa4e15e5 and can be
- ;; removed once this commit makes it into a release.
- (lambda _
- (substitute* "audio/softsynth/fluidsynth.cpp"
- (("#include <fluidsynth.h>") "")
- (("#include \"common/scummsys.h\"") "#include \"config.h\"")
- (("#include \"common/config-manager.h\"" line)
- (string-append "#include <fluidsynth.h>\n"
- "#include \"common/scummsys.h\"\n"
- line)))
- #t))
(replace 'configure
;; configure does not work followed by both "SHELL=..." and
;; "CONFIG_SHELL=..."; set environment variables instead
("faad2" ,faad2)
("fluidsynth" ,fluidsynth)
("freetype" ,freetype)
+ ("fribidi" ,fribidi)
("liba52" ,liba52)
("libflac" ,flac)
("libjpeg-turbo" ,libjpeg-turbo)
play them on systems for which they were never designed!")
(license license:gpl2+)))
+(define-public libticables2
+ (package
+ (name "libticables2")
+ (version "1.3.5")
+ (source (origin
+ (method url-fetch)
+ (uri "https://www.ticalc.org/pub/unix/tilibs.tar.gz")
+ (sha256
+ (base32
+ "07cfwwlidgx4fx88whnlch6y1342x16h15lkvkkdlp2y26sn2yxg"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags (list "--enable-libusb10")
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'unpack
+ (lambda* (#:key source #:allow-other-keys)
+ (invoke "tar" "xvkf" source)
+ (invoke "tar" "xvkf"
+ (string-append "tilibs2/libticables2-"
+ ,version ".tar.bz2"))
+ (chdir (string-append "libticables2-" ,version))
+ #t)))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("autogen" ,autogen)
+ ("automake" ,automake)
+ ("gettext" ,gnu-gettext)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("glib" ,glib)
+ ("libusb" ,libusb)))
+ (synopsis "Link cable library for TI calculators")
+ (description
+ "This package contains libticables, a library for operations on
+@acronym{TI, Texas Instruments} calculator link cables.
+
+This is a part of the TiLP project.")
+ (home-page "http://lpg.ticalc.org/prj_tilp/")
+ (license license:gpl2+)))
+
+(define-public libticonv
+ (package
+ (name "libticonv")
+ (version "1.1.5")
+ (source (origin
+ (method url-fetch)
+ (uri "https://www.ticalc.org/pub/unix/tilibs.tar.gz")
+ (sha256
+ (base32
+ "07cfwwlidgx4fx88whnlch6y1342x16h15lkvkkdlp2y26sn2yxg"))))
+ (build-system gnu-build-system)
+ (arguments
+ ;; build fails with out --enable-iconv (...?)
+ `(#:configure-flags (list "--enable-iconv")
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'unpack
+ (lambda* (#:key source #:allow-other-keys)
+ (invoke "tar" "xvkf" source)
+ (invoke "tar" "xvkf"
+ (string-append "tilibs2/libticonv-"
+ ,version ".tar.bz2"))
+ (chdir (string-append "libticonv-" ,version))
+ #t)))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("glib" ,glib)))
+ (synopsis "Character conversion library for TI calculators")
+ (description
+ "This package contains libticonv, a library to support working with
+@acronym{TI, Texas Instruments} calculator charsets.
+
+This is a part of the TiLP project.")
+ (home-page "http://lpg.ticalc.org/prj_tilp/")
+ (license license:gpl2+)))
+
+(define-public libtifiles2
+ (package
+ (name "libtifiles2")
+ (version "1.1.7")
+ (source (origin
+ (method url-fetch)
+ (uri "https://www.ticalc.org/pub/unix/tilibs.tar.gz")
+ (sha256
+ (base32
+ "07cfwwlidgx4fx88whnlch6y1342x16h15lkvkkdlp2y26sn2yxg"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'unpack
+ (lambda* (#:key source #:allow-other-keys)
+ (invoke "tar" "xvkf" source)
+ (invoke "tar" "xvkf"
+ (string-append "tilibs2/libtifiles2-"
+ ,version ".tar.bz2"))
+ (chdir (string-append "libtifiles2-" ,version))
+ #t)))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("gettext" ,gnu-gettext)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("glib" ,glib)
+ ("libarchive" ,libarchive)
+ ("libticonv" ,libticonv)))
+ (synopsis "File functions library for TI calculators")
+ (description
+ "This package contains libticonv, a library to support working with
+@acronym{TI, Texas Instruments} calculator files.
+
+This is a part of the TiLP project.")
+ (home-page "http://lpg.ticalc.org/prj_tilp/")
+ (license license:gpl2+)))
+
+(define-public libticalcs2
+ (package
+ (name "libticalcs2")
+ (version "1.1.9")
+ (source (origin
+ (method url-fetch)
+ (uri "https://www.ticalc.org/pub/unix/tilibs.tar.gz")
+ (sha256
+ (base32
+ "07cfwwlidgx4fx88whnlch6y1342x16h15lkvkkdlp2y26sn2yxg"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'unpack
+ (lambda* (#:key source #:allow-other-keys)
+ (invoke "tar" "xvkf" source)
+ (invoke "tar" "xvkf"
+ (string-append "tilibs2/libticalcs2-"
+ ,version ".tar.bz2"))
+ (chdir (string-append "libticalcs2-" ,version))
+ #t)))))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("gettext" ,gnu-gettext)
+ ("libtool" ,libtool)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("glib" ,glib)
+ ("libarchive" ,libarchive)
+ ("libticables2" ,libticables2)
+ ("libticonv" ,libticonv)
+ ("libtifiles2" ,libtifiles2)))
+ (synopsis "Support library for TI calculators")
+ (description
+ "This project aims to develop a multi-platform linking program for use
+with all @acronym{TI, Texas Instruments} graphing calculators (TI73 to
+V200PLT).
+
+This is a part of the TiLP project.")
+ (home-page "http://lpg.ticalc.org/prj_tilp/")
+ (license license:gpl2+)))
+
(define-public mame
(package
(name "mame")
- (version "0.222")
+ (version "0.230")
(source
(origin
(method git-fetch)
(commit (apply string-append "mame" (string-split version #\.)))))
(file-name (git-file-name name version))
(sha256
- (base32 "1bfnwfxsnmza4s77ca0cyx4b290dwadkbbc2lyd7xa0yqrh7vvlx"))
+ (base32 "0dk8q2691pycv9mq77h6sdfwjnwdrfwrblf8nwyykrmdawzi56ks"))
(modules '((guix build utils)))
(snippet
;; Remove bundled libraries.
("texinfo" ,texinfo)))
(inputs
`(("alsa-lib" ,alsa-lib)
- ("asio" ,asio)
+ ("asio" ,asio-1.12) ;the bundled copy is at 1.11
("expat" ,expat)
("flac" ,flac)
("fontconfig" ,fontconfig)
`(("assembler-for-tests" ,(cross-binutils "i686-unknown-linux-gnu"))))
("cmocka" ,cmocka)
("hexdump-for-tests" ,util-linux)))
- (home-page "http://www.unicorn-engine.org")
+ (home-page "https://www.unicorn-engine.org")
(synopsis "Unicorn CPU emulator framework")
(description
"Unicorn is a lightweight, multi-platform, multi-architecture CPU emulator
(define-public ppsspp
(package
(name "ppsspp")
- (version "1.10")
+ (version "1.11.3")
(source
(origin
(method git-fetch)
(url "https://github.com/hrydgard/ppsspp")
(commit (string-append "v" version))))
(sha256
- (base32 "02yx1w0ygclnmdl0imsvgj24lkzi55wvxkf47q617j0jgrqhy8yl"))
+ (base32 "1dpxnwvl6jq7z67lbjws4lqc1bxc31xi6ddlmg5n3aig008yi2fp"))
(file-name (git-file-name name version))
(patches
(search-patches "ppsspp-disable-upgrade-and-gold.patch"))
;; 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")
;; 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
" spirv-cross-reflect spirv-cross-util")))
(substitute* "ext/CMakeLists.txt"
(("add_subdirectory\\(glew\\)") "")
- (("add_subdirectory\\(glslang\\)") "")
+ (("add_subdirectory\\(glslang( [A-Z_]*)*\\)") "")
(("add_subdirectory\\(snappy\\)") "")
(("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"
("libpng" ,libpng)
("libzip" ,libzip)
("mesa" ,mesa)
+ ("miniupnpc" ,miniupnpc)
("sdl2" ,sdl2)
("snappy" ,snappy)
("spirv-cross" ,spirv-cross)
;; TODO: unbundle armips.
("armips-source" ,(package-source armips))
("lang"
- ,(let ((commit "d184ba2b607a03435be579406b816c90add334e6"))
+ ,(let ((commit "6bd5b4bc983917ea8402f73c726b46e36f3de0b4"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hrydgard/ppsspp-lang")
(commit commit)))
(sha256
- (base32 "0s003x6247nx09qd6a1jz1l2hsk5d6k1zmh8mg3m6hjjhvbvd9j9"))
+ (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
(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
HCoop / jackhill / guix / guix.git / blobdiff