diff options
| -rw-r--r-- | aux-files/openbox/openbox-add-fix-for-glib2-exposed-segfault.patch | 50 | ||||
| -rw-r--r-- | aux-files/openbox/openbox-python3.patch | 165 | ||||
| -rw-r--r-- | backport.scm | 410 | ||||
| -rw-r--r-- | emulators.scm | 297 |
4 files changed, 625 insertions, 297 deletions
diff --git a/aux-files/openbox/openbox-add-fix-for-glib2-exposed-segfault.patch b/aux-files/openbox/openbox-add-fix-for-glib2-exposed-segfault.patch new file mode 100644 index 0000000..ef68d31 --- /dev/null +++ b/aux-files/openbox/openbox-add-fix-for-glib2-exposed-segfault.patch @@ -0,0 +1,50 @@ +From 9ed6fdd71890c5cc43747f105382d5677e5d37e7 Mon Sep 17 00:00:00 2001 +From: pldubouilh <pldubouilh@gmail.com> +Date: Fri, 17 Mar 2023 18:23:47 +0100 +Subject: [PATCH] Fix list traversal issue in client_calc_layer + +The calls to client_calc_layer_internal can modify stacking_list, which +can cause us to follow dangling ->next pointers (either by the pointer +itself already being freed, or it pointing to a freed area). Avoid this +by copying the list first, the goal is to visit every client in the list +once so this should be fine. +--- + openbox/client.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/openbox/client.c b/openbox/client.c +index 7168b2407..b8264587c 100644 +--- a/openbox/client.c ++++ b/openbox/client.c +@@ -2742,9 +2742,12 @@ static void client_calc_layer_internal(ObClient *self) + void client_calc_layer(ObClient *self) + { + GList *it; ++ /* the client_calc_layer_internal calls below modify stacking_list, ++ so we have to make a copy to iterate over */ ++ GList *list = g_list_copy(stacking_list); + + /* skip over stuff above fullscreen layer */ +- for (it = stacking_list; it; it = g_list_next(it)) ++ for (it = list; it; it = g_list_next(it)) + if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; + + /* find the windows in the fullscreen layer, and mark them not-visited */ +@@ -2757,7 +2760,7 @@ void client_calc_layer(ObClient *self) + client_calc_layer_internal(self); + + /* skip over stuff above fullscreen layer */ +- for (it = stacking_list; it; it = g_list_next(it)) ++ for (it = list; it; it = g_list_next(it)) + if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; + + /* now recalc any windows in the fullscreen layer which have not +@@ -2768,6 +2771,8 @@ void client_calc_layer(ObClient *self) + !WINDOW_AS_CLIENT(it->data)->visited) + client_calc_layer_internal(it->data); + } ++ ++ g_list_free(it); + } + + gboolean client_should_show(ObClient *self) diff --git a/aux-files/openbox/openbox-python3.patch b/aux-files/openbox/openbox-python3.patch new file mode 100644 index 0000000..782524d --- /dev/null +++ b/aux-files/openbox/openbox-python3.patch @@ -0,0 +1,165 @@ +Retrieved from the openbox Debian package. + +From acfbbc4ea40932f183617bb7006700140fe5f61e Mon Sep 17 00:00:00 2001 +From: Troy Curtis Jr <troycurtisjr@gmail.com> +Date: Wed, 13 Sep 2017 21:59:48 -0500 +Subject: [PATCH] Add python3 support to openbox-xdg-autostart. + +Updated syntax in openbox-xdg-autostart to support both python2 and +python3. + +Added a configure substitution to set the chosen python at build time. + +https://bugzilla.icculus.org/show_bug.cgi?id=6444 +--- + .gitignore | 1 + + configure.ac | 3 + + ...xdg-autostart => openbox-xdg-autostart.in} | 70 +++++++++---------- + 3 files changed, 38 insertions(+), 36 deletions(-) + rename data/autostart/{openbox-xdg-autostart => openbox-xdg-autostart.in} (77%) + +diff --git a/configure.ac b/configure.ac +index ca1602670..9a31e9845 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -103,6 +103,8 @@ AC_CHECK_HEADERS(ctype.h dirent.h errno.h fcntl.h grp.h locale.h pwd.h) + AC_CHECK_HEADERS(signal.h string.h stdio.h stdlib.h unistd.h sys/stat.h) + AC_CHECK_HEADERS(sys/select.h sys/socket.h sys/time.h sys/types.h sys/wait.h) + ++AM_PATH_PYTHON([2],,) ++ + AC_PATH_PROG([SED], [sed], [no]) + if test "$SED" = "no"; then + AC_MSG_ERROR([The program "sed" is not available. This program is required to build Openbox.]) +@@ -259,6 +261,7 @@ AC_CONFIG_FILES([ + obrender/version.h + obt/version.h + version.h ++ data/autostart/openbox-xdg-autostart + ]) + AC_CONFIG_COMMANDS([doc], + [test -d doc || mkdir doc]) +diff --git a/data/autostart/openbox-xdg-autostart b/data/autostart/openbox-xdg-autostart.in +similarity index 77% +rename from data/autostart/openbox-xdg-autostart +rename to data/autostart/openbox-xdg-autostart.in +index 04a17a199..3c365b112 100755 +--- a/data/autostart/openbox-xdg-autostart ++++ b/data/autostart/openbox-xdg-autostart.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!@PYTHON@ + + # openbox-xdg-autostart runs things based on the XDG autostart specification + # Copyright (C) 2008 Dana Jansens +@@ -28,9 +28,7 @@ try: + from xdg.DesktopEntry import DesktopEntry + from xdg.Exceptions import ParsingError + except ImportError: +- print +- print >>sys.stderr, "ERROR:", ME, "requires PyXDG to be installed" +- print ++ sys.stderr.write("\nERROR: %s requires PyXDG to be installed\n" % ME) + sys.exit(1) + + def main(argv=sys.argv): +@@ -51,7 +49,7 @@ def main(argv=sys.argv): + try: + autofile = AutostartFile(path) + except ParsingError: +- print "Invalid .desktop file: " + path ++ print("Invalid .desktop file: " + path) + else: + if not autofile in files: + files.append(autofile) +@@ -99,9 +97,9 @@ class AutostartFile: + + def _alert(self, str, info=False): + if info: +- print "\t ", str ++ print("\t ", str) + else: +- print "\t*", str ++ print("\t*", str) + + def _showInEnvironment(self, envs, verbose=False): + default = not self.de.getOnlyShowIn() +@@ -146,14 +144,14 @@ class AutostartFile: + + def display(self, envs): + if self._shouldRun(envs): +- print "[*] " + self.de.getName() ++ print("[*] " + self.de.getName()) + else: +- print "[ ] " + self.de.getName() ++ print("[ ] " + self.de.getName()) + self._alert("File: " + self.path, info=True) + if self.de.getExec(): + self._alert("Executes: " + self.de.getExec(), info=True) + self._shouldRun(envs, True) +- print ++ print() + + def run(self, envs): + here = os.getcwd() +@@ -165,34 +163,34 @@ class AutostartFile: + os.chdir(here) + + def show_help(): +- print "Usage:", ME, "[OPTION]... [ENVIRONMENT]..." +- print +- print "This tool will run xdg autostart .desktop files" +- print +- print "OPTIONS" +- print " --list Show a list of the files which would be run" +- print " Files which would be run are marked with an asterix" +- print " symbol [*]. For files which would not be run," +- print " information is given for why they are excluded" +- print " --help Show this help and exit" +- print " --version Show version and copyright information" +- print +- print "ENVIRONMENT specifies a list of environments for which to run autostart" +- print "applications. If none are specified, only applications which do not " +- print "limit themselves to certain environments will be run." +- print +- print "ENVIRONMENT can be one or more of:" +- print " GNOME Gnome Desktop" +- print " KDE KDE Desktop" +- print " ROX ROX Desktop" +- print " XFCE XFCE Desktop" +- print " Old Legacy systems" +- print ++ print("Usage:", ME, "[OPTION]... [ENVIRONMENT]...") ++ print() ++ print("This tool will run xdg autostart .desktop files") ++ print() ++ print("OPTIONS") ++ print(" --list Show a list of the files which would be run") ++ print(" Files which would be run are marked with an asterix") ++ print(" symbol [*]. For files which would not be run,") ++ print(" information is given for why they are excluded") ++ print(" --help Show this help and exit") ++ print(" --version Show version and copyright information") ++ print() ++ print("ENVIRONMENT specifies a list of environments for which to run autostart") ++ print("applications. If none are specified, only applications which do not ") ++ print("limit themselves to certain environments will be run.") ++ print() ++ print("ENVIRONMENT can be one or more of:") ++ print(" GNOME Gnome Desktop") ++ print(" KDE KDE Desktop") ++ print(" ROX ROX Desktop") ++ print(" XFCE XFCE Desktop") ++ print(" Old Legacy systems") ++ print() + + def show_version(): +- print ME, VERSION +- print "Copyright (c) 2008 Dana Jansens" +- print ++ print(ME, VERSION) ++ print("Copyright (c) 2008 Dana Jansens") ++ print() + + if __name__ == "__main__": + sys.exit(main()) diff --git a/backport.scm b/backport.scm new file mode 100644 index 0000000..d83524b --- /dev/null +++ b/backport.scm @@ -0,0 +1,410 @@ +(define-module (backport) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages admin) + #: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 backup) + #:use-module (gnu packages base) + #:use-module (gnu packages bash) + #:use-module (gnu packages bison) + #:use-module (gnu packages boost) + #:use-module (gnu packages cdrom) + #:use-module (gnu packages check) + #:use-module (gnu packages cmake) + #:use-module (gnu packages compression) + #:use-module (gnu packages containers) + #:use-module (gnu packages cross-base) + #:use-module (gnu packages curl) + #:use-module (gnu packages digest) + #:use-module (gnu packages elf) + #:use-module (gnu packages emulators) + #:use-module (gnu packages engineering) + #:use-module (gnu packages flex) + #:use-module (gnu packages fltk) + #: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 game-development) + #:use-module (gnu packages gettext) + #:use-module (gnu packages gl) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages graphics) + #:use-module (gnu packages gtk) + #:use-module (gnu packages image) + #:use-module (gnu packages libedit) + #:use-module (gnu packages libusb) + #:use-module (gnu packages linux) + #:use-module (gnu packages linux) + #:use-module (gnu packages lua) + #:use-module (gnu packages maths) + #:use-module (gnu packages mp3) + #:use-module (gnu packages music) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages networking) + #:use-module (gnu packages networking) + #:use-module (gnu packages openbox) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) + #:use-module (gnu packages pretty-print) + #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) + #:use-module (gnu packages sdl) + #:use-module (gnu packages sdl) + #:use-module (gnu packages sphinx) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages textutils) + #:use-module (gnu packages tls) + #:use-module (gnu packages upnp) + #:use-module (gnu packages version-control) + #:use-module (gnu packages video) + #:use-module (gnu packages vulkan) + #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xiph) + #:use-module (gnu packages xml) + #:use-module (gnu packages xorg) + #:use-module (gnu packages) + #:use-module (guix build-system cmake) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module (guix hg-download) + #:use-module (guix packages) + #:use-module (guix svn-download) + #:use-module (guix utils) + #:use-module (ice-9 match) + ) + +(define-public dolphin-emu-next + (package + (inherit dolphin-emu) + (name "dolphin-emu-next") + (version "2503") + ;(version "ad3650abfcae6432338ba976123958ee67a4106c") + (inputs + (list alsa-lib + ao + bluez + bzip2 + cubeb + curl + enet-1.3.18 + eudev + ffmpeg-4 + fmt-10 + font-wqy-microhei + freetype + git-minimal + glew + glib + glu + gtk+-2 + hidapi + libevdev + libpng + libusb + libx11 + libxi + libxrandr + lzo + mbedtls-lts + mesa + miniupnpc + minizip-ng + openal + pugixml + pulseaudio + qtbase + qtsvg + sdl2-2.30.9 + sfml-3 + soil + soundtouch-1/integer-samples + vulkan-loader + xxhash + zlib + libxcursor + libxi + `(,zstd "lib"))) + + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'set-scm-desc-str + (lambda _ + (substitute* "Source/Core/Common/scmrev.h.in" (("#define SCM_REV_STR \"\\$\\{DOLPHIN_WC_REVISION\\}\"") "#define SCM_REV_STR \"9763c0a1e2b9db0c3861d25bc2f5a0ace6a15ee3\"")) + )) + (add-before 'configure 'remove-unittests-target-post-build-command + (lambda _ + ;; To skip a few problematic tests, CTest will be manually + ;; invoked in the post-check phase. + (with-directory-excursion "Source/UnitTests" + (substitute* "CMakeLists.txt" + (("add_custom_command\\(TARGET unittests POST_BUILD.*") + ""))))) + (add-before 'configure 'generate-fonts&hardcore-libvulkan-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((fontfile + (search-input-file inputs + "/share/fonts/truetype/wqy-microhei.ttc")) + (libvulkan + (search-input-file inputs "/lib/libvulkan.so"))) + (chdir "docs") + (invoke "bash" "-c" "g++ -O2 $(freetype-config \ + --cflags --libs) gc-font-tool.cpp -o gc-font-tool") + (invoke "./gc-font-tool" "a" fontfile "font_western.bin") + (invoke "./gc-font-tool" "s" fontfile "font_japanese.bin") + (copy-file "font_japanese.bin" "../Data/Sys/GC/font_japanese.bin") + (copy-file "font_western.bin" "../Data/Sys/GC/font_western.bin") + (chdir "..") + (substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp" + (("\"vulkan\", 1") (string-append "\"vulkan\"")) + (("\"vulkan\"") (string-append "\"" libvulkan "\"")) + (("Common::DynamicLibrary::GetVersionedFilename") ""))))) + (add-after 'check 'post-check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "Source/UnitTests" + (invoke "ctest" "-V" "--output-on-failure" + ;; These tests fail due to libusb failing to + ;; init inside the build container. + "-E" (string-join + '("MMIOTest" + "PageFaultTest" + "CoreTimingTest" + "FileSystemTest" + "PowerPCTest" + "VertexLoaderTest") + "|")))))) + (add-before 'install 'build-codeloader.bin + (lambda _ + (with-directory-excursion "../source/docs" + ;; The following command-line is adapted from the example in + ;; codehandler.s. + (invoke "powerpc-linux-gnu-gcc" "-mpowerpc" "-mbig" + "codehandler.s" "-nostartfiles" "-nodefaultlibs" + "-nostdlib" "-T" "codehandler.ld" + "-o" "codehandler.bin") + (copy-file "codehandler.bin" "../Data/Sys/codehandler.bin")))) + (add-before 'install 'build-dsp_rom.bin + (lambda _ + ;; Ensure dsptool is on PATH. + (setenv "PATH" (string-append (getenv "PATH") ":" + (getcwd) "/Binaries")) + (with-directory-excursion "../source" + (invoke "dsptool" "-o" "Data/Sys/GC/dsp_rom.bin" + "docs/DSP/free_dsp_rom/dsp_rom.ds")))) + (add-before 'install 'build-dsp_coefs.bin + (lambda _ + (with-directory-excursion "../source" + (invoke "python3" "docs/DSP/free_dsp_rom/generate_coefs.py") + (rename-file "dsp_coef.bin" "Data/Sys/GC/dsp_coef.bin"))))) + ;; The FindGTK2 cmake script only checks hardcoded directories for + ;; glib/gtk headers. Also add some include directories via the CXX + ;; flags to let GCC find some headers not actively searched by the + ;; build system. + #:configure-flags + #~(list (string-append "-DCMAKE_CXX_FLAGS=" + "-I" (search-input-directory + %build-inputs "include/soundtouch")) + "-DDSPTOOL=ON" + (string-append "-DX11_INCLUDE_DIR=" + #$(this-package-input "libx11") + "/include") + (string-append "-DOLPHIN_WC_DESCRIBE=2503") + (string-append "-DOLPHIN_WC_REVISION=9763c0a1e2b9db0c3861d25bc2f5a0ace6a15ee3") + (string-append "-DOLPHIN_WC_BRANCH=HEAD") + (string-append "-DCMAKE_BUILD_TYPE=Release") + (string-append "-DX11_LIBRARIES=" + (search-input-file %build-inputs + "lib/libX11.so")) + "-DX11_FOUND=1") + #:test-target "unittests")) + + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dolphin-emu/dolphin") + (recursive? #t) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yyl91sb8w422zfdml9hmwwn3088gxv977aailc0l5icaxf4m8m2")) + (modules '((guix build utils) + (ice-9 regex))) + (snippet + '(begin + ;; Remove external stuff we don't need. + (for-each (lambda (dir) + (delete-file-recursively + (string-append "Externals/" dir))) + '( + ;"LZO" "OpenAL" "Qt" "SFML" "bzip2" + "LZO" "OpenAL" "Qt" "bzip2" + ;; XXX: Attempting to use the vulkan-headers package + ;; results in "error: + ;; ‘VK_PRESENT_MODE_RANGE_SIZE_KHR’ was not declared + ;; in this scope". + ;;"Vulkan" + "cubeb" "curl" "enet" + ;"ffmpeg" "fmt" "gettext" + "fmt" "gettext" + ;; XXX: Attempting to use an unbundled glslang at the + ;; exact commit used by Dolphin still results in + ;; "error: ‘DefaultTBuiltInResource’ is not a member + ;; of ‘glslang’". + ;;"glslang" + ;; XXX: Googletest cannot currently easily be + ;; unbundled, as there are missing linking + ;; directives. + ;;"gtest" + ;"hidapi" "libpng" "libusb" "mbedtls" + "hidapi" "libusb" "mbedtls" + ;"miniupnpc" "minizip" "MoltenVK" "pugixml" + "miniupnpc" "MoltenVK" "pugixml" + ;"soundtouch" + ;"xxhash" "zlib" "zstd" + "xxhash" "zstd" + )) + ;; Clean up the source. + (for-each delete-file + (find-files + "." + (lambda (file _) + (and (string-match "\\.(bin|dsy|exe|jar|rar)$" file) + ;; Preserve the important wc24 .bin + ;; configuration *data* files. + (not (member (basename file) + '("misc.bin" + "nwc24dl.bin" + "nwc24fl.bin" + "nwc24fls.bin"))))))) + ;; Do not attempt to include now-missing directories. + (substitute* "CMakeLists.txt" + ((".*add_subdirectory.*Externals/enet.*") "") + ((".*add_subdirectory.*Externals/soundtouch.*") "") + ((".*add_subdirectory.*Externals/xxhash.*") "")))) + ;(patches (search-patches "dolphin-emu-data.patch") + )))) + +(define-public sdl2-2.30.9 + (package + (inherit sdl2) + (name "sdl2-2.30.9") + (version "2.30.9") + (source (origin + (method url-fetch) + (uri + (string-append "https://libsdl.org/release/SDL2-" + version ".tar.gz")) + (sha256 + (base32 + "197bdcfnnsd4k7q91y518kari0p3rcqbdfq40zsn79w73kvp9d94")))) + )) + +(define-public enet-1.3.18 + (package + (inherit enet) + (name "enet-1.3.18") + (version "1.3.18") + (source + (origin + (method url-fetch) + (uri (string-append "http://enet.bespin.org/download/" + "enet-" version ".tar.gz")) + (sha256 + (base32 "0djxz2j8248bsvbrs42vr39fhxlrqr3lqbhzs7yb92ync19hr2ia")))) + )) + +(define-public sfml-3 + (package + (inherit sfml) + (name "sfml-3") + (version "3.0.0") + (inputs (modify-inputs (package-inputs sfml) + (prepend libxcursor libxi miniaudio))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SFML/SFML") + (recursive? #t) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y37cmpp490gcibajigxsbjc6icggqv40jrhzj2kwygpc0ppzb3v")) + (modules '((guix build utils))) + ;(snippet + ; '(begin + ; ;; Ensure system libraries are used. + ; (delete-file-recursively "extlibs") + ; #t)) + )) + )) + +(define-public miniaudio + (package + (name "miniaudio") + (version "0.11.22") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mackron/miniaudio") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pjaiq71x24n9983vkhjxrsbraa24053h727db22b1rb2xyfrzm3")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (let ((out #$output)) + ;; Ensure the output directory exists + (mkdir-p (string-append out "/lib")) + ;; Copy the static libraries to the output directory + (for-each (lambda (file) + (copy-file file (string-append out "/lib/" file))) ; Ensure the destination is a file + '("libminiaudio.a" + "libminiaudio_channel_combiner_node.a" + "libminiaudio_channel_separator_node.a" + "libminiaudio_ltrim_node.a" + "libminiaudio_reverb_node.a" + "libminiaudio_vocoder_node.a")))))))) + (synopsis "Audio playback and capture library written in C, in a single source file.") + (description "miniaudio is written in C with no dependencies except the standard library and should compile clean on all major compilers without the need to install any additional development packages. All major desktop and mobile platforms are supported.") + (home-page "https://miniaud.io/") + (license license:expat))) + +(define-public openbox-patched + (package + (inherit openbox) + (name "openbox-patched") + (version "3.6.1") + (source (origin + (method url-fetch) + (uri (string-append + "http://openbox.org/dist/openbox/" name "-" + version ".tar.xz")) + (sha256 + (base32 + "0vg2y1qddsdxkjv806mzpvmkgzliab8ll4s7zm7ma5jnriamirxb")) + (patches (search-patches "aux-files/openbox/openbox-add-fix-for-glib2-exposed-segfault.patch" "aux-files/openbox/openbox-python3.patch")))) + )) + diff --git a/emulators.scm b/emulators.scm deleted file mode 100644 index 65d47c9..0000000 --- a/emulators.scm +++ /dev/null @@ -1,297 +0,0 @@ -(define-module (emulators) - #:use-module (ice-9 match) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix gexp) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix svn-download) - #:use-module (guix hg-download) - #:use-module (guix build-system cmake) - #:use-module (guix utils) - #:use-module (gnu packages) - #:use-module (gnu packages sdl) - #:use-module (gnu packages emulators) - #:use-module (gnu packages linux) - #:use-module (gnu packages networking) - #:use-module (gnu packages game-development) - #:use-module (gnu packages pretty-print) - #:use-module (gnu packages admin) - #: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 backup) - #:use-module (gnu packages base) - #:use-module (gnu packages bash) - #:use-module (gnu packages bison) - #:use-module (gnu packages boost) - #:use-module (gnu packages cdrom) - #:use-module (gnu packages check) - #:use-module (gnu packages cmake) - #:use-module (gnu packages compression) - #:use-module (gnu packages containers) - #:use-module (gnu packages cross-base) - #:use-module (gnu packages curl) - #:use-module (gnu packages digest) - #:use-module (gnu packages engineering) - #:use-module (gnu packages elf) - #:use-module (gnu packages flex) - #:use-module (gnu packages fltk) - #: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 gettext) - #:use-module (gnu packages gl) - #:use-module (gnu packages glib) - #:use-module (gnu packages gnome) - #:use-module (gnu packages graphics) - #:use-module (gnu packages gtk) - #:use-module (gnu packages image) - #:use-module (gnu packages libedit) - #:use-module (gnu packages libusb) - #:use-module (gnu packages linux) - #:use-module (gnu packages lua) - #:use-module (gnu packages maths) - #:use-module (gnu packages mp3) - #:use-module (gnu packages music) - #:use-module (gnu packages ncurses) - #:use-module (gnu packages networking) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages pretty-print) - #:use-module (gnu packages pulseaudio) - #:use-module (gnu packages python) - #:use-module (gnu packages python-build) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages qt) - #:use-module (gnu packages sdl) - #:use-module (gnu packages sphinx) - #:use-module (gnu packages sqlite) - #:use-module (gnu packages texinfo) - #:use-module (gnu packages textutils) - #:use-module (gnu packages tls) - #:use-module (gnu packages upnp) - #:use-module (gnu packages video) - #:use-module (gnu packages vulkan) - #:use-module (gnu packages xdisorg) - #:use-module (gnu packages xiph) - #:use-module (gnu packages xml) - #:use-module (gnu packages xorg) - #:use-module (gnu packages web) - ) - -(define-public dolphin-emu-next - (let ((commit "0afbeae70c94b72318035c300ef085d4753f7462") - (revision "13669")) - (package - (inherit dolphin-emu) - (name "dolphin-emu-next") - (inputs - (list alsa-lib - ao - bluez - bzip2 - cubeb - curl - enet-1.3.18 - eudev - ffmpeg-4 - fmt-10 - font-wqy-microhei - freetype - glew - glib - glu - gtk+-2 - hidapi - libevdev - libpng - libusb - libx11 - libxi - libxrandr - lzo - mbedtls-lts - mesa - miniupnpc - minizip-ng - openal - pugixml - pulseaudio - qtbase - qtsvg - sdl2-2.30.9 - sfml-3 - soil - soundtouch-1/integer-samples - vulkan-loader - xxhash - zlib - libxcursor - libxi - `(,zstd "lib"))) - - (version (git-version "5.0" revision commit)) - - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dolphin-emu/dolphin") - (recursive? #t) - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0y803ffir4gl93sh6q0rrjzig949snxzxiayzjqcfysvvqbwkfkw")) - (modules '((guix build utils) - (ice-9 regex))) - (snippet - '(begin - ;; Remove external stuff we don't need. - (for-each (lambda (dir) - (delete-file-recursively - (string-append "Externals/" dir))) - '( - ;"LZO" "OpenAL" "Qt" "SFML" "bzip2" - "LZO" "OpenAL" "Qt" "bzip2" - ;; XXX: Attempting to use the vulkan-headers package - ;; results in "error: - ;; ‘VK_PRESENT_MODE_RANGE_SIZE_KHR’ was not declared - ;; in this scope". - ;;"Vulkan" - "cubeb" "curl" "enet" - ;"ffmpeg" "fmt" "gettext" - "fmt" "gettext" - ;; XXX: Attempting to use an unbundled glslang at the - ;; exact commit used by Dolphin still results in - ;; "error: ‘DefaultTBuiltInResource’ is not a member - ;; of ‘glslang’". - ;;"glslang" - ;; XXX: Googletest cannot currently easily be - ;; unbundled, as there are missing linking - ;; directives. - ;;"gtest" - ;"hidapi" "libpng" "libusb" "mbedtls" - "hidapi" "libusb" "mbedtls" - ;"miniupnpc" "minizip" "MoltenVK" "pugixml" - "miniupnpc" "MoltenVK" "pugixml" - ;"soundtouch" - ;"xxhash" "zlib" "zstd" - "xxhash" "zstd" - )) - ;; Clean up the source. - (for-each delete-file - (find-files - "." - (lambda (file _) - (and (string-match "\\.(bin|dsy|exe|jar|rar)$" file) - ;; Preserve the important wc24 .bin - ;; configuration *data* files. - (not (member (basename file) - '("misc.bin" - "nwc24dl.bin" - "nwc24fl.bin" - "nwc24fls.bin"))))))) - ;; Do not attempt to include now-missing directories. - (substitute* "CMakeLists.txt" - ((".*add_subdirectory.*Externals/enet.*") "") - ((".*add_subdirectory.*Externals/soundtouch.*") "") - ((".*add_subdirectory.*Externals/xxhash.*") "")))) - ;(patches (search-patches "dolphin-emu-data.patch") - ))))) - -(define-public sdl2-2.30.9 - (package - (inherit sdl2) - (name "sdl2-2.30.9") - (version "2.30.9") - (source (origin - (method url-fetch) - (uri - (string-append "https://libsdl.org/release/SDL2-" - version ".tar.gz")) - (sha256 - (base32 - "197bdcfnnsd4k7q91y518kari0p3rcqbdfq40zsn79w73kvp9d94")))) - )) - -(define-public enet-1.3.18 - (package - (inherit enet) - (name "enet-1.3.18") - (version "1.3.18") - (source - (origin - (method url-fetch) - (uri (string-append "http://enet.bespin.org/download/" - "enet-" version ".tar.gz")) - (sha256 - (base32 "0djxz2j8248bsvbrs42vr39fhxlrqr3lqbhzs7yb92ync19hr2ia")))) - )) - -(define-public sfml-3 - (package - (inherit sfml) - (name "sfml-3") - (version "3.0.0") - (inputs (modify-inputs (package-inputs sfml) - (prepend libxcursor libxi miniaudio))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/SFML/SFML") - (recursive? #t) - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0y37cmpp490gcibajigxsbjc6icggqv40jrhzj2kwygpc0ppzb3v")) - (modules '((guix build utils))) - ;(snippet - ; '(begin - ; ;; Ensure system libraries are used. - ; (delete-file-recursively "extlibs") - ; #t)) - )) - )) - -(define-public miniaudio - (package - (name "miniaudio") - (version "0.11.22") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mackron/miniaudio") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1pjaiq71x24n9983vkhjxrsbraa24053h727db22b1rb2xyfrzm3")))) - (build-system cmake-build-system) - (arguments - (list - #:tests? #f - #:phases - #~(modify-phases %standard-phases - (replace 'install - (lambda _ - (let ((out #$output)) - ;; Ensure the output directory exists - (mkdir-p (string-append out "/lib")) - ;; Copy the static libraries to the output directory - (for-each (lambda (file) - (copy-file file (string-append out "/lib/" file))) ; Ensure the destination is a file - '("libminiaudio.a" - "libminiaudio_channel_combiner_node.a" - "libminiaudio_channel_separator_node.a" - "libminiaudio_ltrim_node.a" - "libminiaudio_reverb_node.a" - "libminiaudio_vocoder_node.a")))))))) - (synopsis "Audio playback and capture library written in C, in a single source file.") - (description "miniaudio is written in C with no dependencies except the standard library and should compile clean on all major compilers without the need to install any additional development packages. All major desktop and mobile platforms are supported.") - (home-page "https://miniaud.io/") - (license license:expat))) |