Package: guix-patches;
Reported by: Lars-Dominik Braun <lars <at> 6xq.net>
Date: Fri, 16 Sep 2022 13:39:02 UTC
Severity: normal
Tags: patch
Done: Ludovic Courtès <ludo <at> gnu.org>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: help-debbugs <at> gnu.org (GNU bug Tracking System) To: Lars-Dominik Braun <lars <at> 6xq.net> Subject: bug#57861: closed (Re: bug#57861: [PATCH] gnu: Add ultrastar-deluxe.) Date: Mon, 07 Nov 2022 23:01:02 +0000
[Message part 1 (text/plain, inline)]
Your bug report #57861: [PATCH] gnu: Add ultrastar-deluxe. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 57861 <at> debbugs.gnu.org. -- 57861: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=57861 GNU Bug Tracking System Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Ludovic Courtès <ludo <at> gnu.org> To: Lars-Dominik Braun <lars <at> 6xq.net> Cc: 57861-done <at> debbugs.gnu.org, Maxime Devos <maximedevos <at> telenet.be> Subject: Re: bug#57861: [PATCH] gnu: Add ultrastar-deluxe. Date: Mon, 07 Nov 2022 23:59:57 +0100Hi, Lars-Dominik Braun <lars <at> 6xq.net> skribis: >>From c542fd020cbf69fa319ea13301b80eedd35f34a3 Mon Sep 17 00:00:00 2001 > From: Lars-Dominik Braun <lars <at> 6xq.net> > Date: Wed, 19 Oct 2022 13:05:25 +0200 > Subject: [PATCH v2 2/2] gnu: Add ultrastar-deluxe. > > * gnu/packages/games.scm (ultrastar-deluxe): New variable. > * gnu/packages/patches/ultrastar-deluxe-no-freesans.patch: New file. > * gnu/local.mk: Add it. Applied on your behalf. Turns out pascal.scm didn’t need to include (gnu packages commencement) so I did that first. Next step is a fix for <https://issues.guix.gnu.org/55968>, which affects this package too… Thanks, Ludo’.
[Message part 3 (message/rfc822, inline)]
From: Lars-Dominik Braun <lars <at> 6xq.net> To: guix-patches <at> gnu.org Subject: [PATCH] gnu: Add ultrastar-deluxe. Date: Fri, 16 Sep 2022 15:37:25 +0200Hi, this patch adds UltraStar Deluxe (USDX), a karaoke game. The top-level directory includes a copy of the GPL and the game sources also bear GPL headers, but there is no explicit license for assets, so it’s hard to tell whether they are actually free or not. Any opinions? If not, we could move this to the Guix games channel. Cheers, Lars --- gnu/local.mk | 1 + gnu/packages/games.scm | 91 +++++++++++++++++++ .../ultrastar-deluxe-no-freesans.patch | 31 +++++++ 3 files changed, 123 insertions(+) create mode 100644 gnu/packages/patches/ultrastar-deluxe-no-freesans.patch diff --git a/gnu/local.mk b/gnu/local.mk index cd41e6794d..9d9f6b3406 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1900,6 +1900,7 @@ dist_patch_DATA = \ %D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \ %D%/packages/patches/u-boot-rk3399-enable-emmc-phy.patch \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ + %D%/packages/patches/ultrastar-deluxe-no-freesans.patch \ %D%/packages/patches/ungoogled-chromium-extension-search-path.patch \ %D%/packages/patches/ungoogled-chromium-ffmpeg-compat.patch \ %D%/packages/patches/ungoogled-chromium-RUNPATH.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 60ce0167a6..4712d9c4ca 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11169,6 +11169,97 @@ (define-public freerct and unsafe rides. Which path will you take?") (license license:gpl2))) +;; Lazily resolve to avoid a circular dependency. +(define fpc* + (delay (module-ref (resolve-interface '(gnu packages pascal)) + 'fpc))) + +(define-public ultrastar-deluxe + ;; The last release is quite old and does not support recent versions of ffmpeg. + (let ((commit "43484b0a10ce6aae339e19d81ae2f7b37caf6baa") + (revision "1")) + (package + (name "ultrastar-deluxe") + (version (git-version "2020.4.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/UltraStar-Deluxe/USDX.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "078g1rbm1ympmwq9s64v68sxvcms7rr0qid12d2wgm4r04ana47r")) + (patches (search-patches "ultrastar-deluxe-no-freesans.patch")) + (modules '((guix build utils))) + (snippet + `(begin + ;; Remove Windows binaries. + (for-each delete-file (find-files "game" "\\.dll$")) + ;; Remove font blobs. + (let ((font-directories (list "DejaVu" "FreeSans" "NotoSans" + "wqy-microhei"))) + (for-each + (lambda (d) (delete-file-recursively + (string-append "game/fonts/" d))) + font-directories)))))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; No tests. + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs configure-flags outputs #:allow-other-keys) + ;; The configure script looks for lua$version, but we provide lua-$version. + (substitute* "configure.ac" + (("lua\\$i") "lua-$i")) + ;; fpc does not pass -lfoo to the linker, but uses its own linker script, + ;; which references libs. Pass the libraries listed in that linker script, + ;; so our custom linker adds a correct rpath. + (substitute* "src/Makefile.in" + (("linkflags\\s+:= ") + (string-append "linkflags := -lpthread -lsqlite3 -lSDL2 " + " -lSDL2_image -ldl " + "-lz -lfreetype -lportaudio -lavcodec " + "-lavformat -lavutil -lswresample " + "-lswscale -llua -ldl -lX11 -lportmidi " + "-L" #$zlib "/lib " + "-L" #$libx11 "/lib " + "-L" #$portmidi "/lib "))))) + (add-after 'install 'font-paths + (lambda* (#:key outputs #:allow-other-keys) + (substitute* (string-append + (assoc-ref outputs "out") + "/share/ultrastardx/fonts/fonts.ini") + (("=NotoSans/") (string-append "=" #$font-google-noto + "/share/fonts/truetype/")) + (("=DejaVu/") (string-append "=" #$font-dejavu + "/share/fonts/truetype/")))))))) + (inputs (list ffmpeg + font-dejavu + font-google-noto + ; Not needed, since we don’t have freesans. + ;font-wqy-microhei + freetype + libx11 + lua + portaudio + portmidi + sdl2 + sdl2-image + sqlite + zlib)) + (native-inputs (list pkg-config (force fpc*) autoconf automake)) + (synopsis "Karaoke game") + (description + "UltraStar Deluxe (USDX) is a free and open source karaoke game. It +allows up to six players to sing along with music using microphones +in order to score points, depending on the pitch of the voice and the +rhythm of singing.") + (home-page "https://usdx.eu/") + (license license:gpl2+)))) + (define-public steam-devices-udev-rules ;; Last release from 2019-04-10 (let ((commit "d87ef558408c5e7a1a793d738db4c9dc2cb5f8fa") diff --git a/gnu/packages/patches/ultrastar-deluxe-no-freesans.patch b/gnu/packages/patches/ultrastar-deluxe-no-freesans.patch new file mode 100644 index 0000000000..7beba80774 --- /dev/null +++ b/gnu/packages/patches/ultrastar-deluxe-no-freesans.patch @@ -0,0 +1,31 @@ +Remove references to FreeSans font, which is not packaged for Guix. + +--- a/game/fonts/fonts.ini 1970-01-01 01:00:01.000000000 +0100 ++++ b/game/fonts/fonts.ini 2022-09-16 14:31:51.483096847 +0200 +@@ -116,26 +116,6 @@ + BoldHighResPreCache=0 + BoldHighResOutline=0.02 + +-[Font_FreeSans] +-Name=Free Sans +-RegularFile=FreeSans/FreeSans.ttf +-RegularFallbackFile1=wqy-microhei/wqy-microhei.ttc +-;RegularGlyphSpacing=1.4 +-;RegularStretch=1.2 +-BoldFile=FreeSans/FreeSansBold.ttf +-BoldFallbackFile1=wqy-microhei/wqy-microhei.ttc +-;BoldEmbolden=0.06 +-OutlineFile=FreeSans/FreeSansBold.ttf +-OutlineOutline=0.06 +-;OutlineColorR=0.3 +-;OutlineColorG=0.3 +-;OutlineColorB=0.3 +-;OutlineColorA=0.3 +-BoldHighResFile=FreeSans/FreeSansBold.ttf +-BoldHighResMaxResolution=256 +-BoldHighResPreCache=0 +-BoldHighResOutline=0.02 +- + [Font_DejaVuSans] + Name=DejaVu Sans + RegularFile=DejaVu/DejaVuSans.ttf -- 2.35.1
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.