From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id APMmJyrbT2PbGAEAbAwnHQ (envelope-from ) for ; Wed, 19 Oct 2022 13:10:34 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id mA8yJirbT2M0UgAAG6o9tA (envelope-from ) for ; Wed, 19 Oct 2022 13:10:34 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DFF809B9A for ; Wed, 19 Oct 2022 13:10:33 +0200 (CEST) Received: from localhost ([::1]:58882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ol6y1-0002ut-19 for larch@yhetil.org; Wed, 19 Oct 2022 07:10:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ol6xW-0002qH-Et for guix-patches@gnu.org; Wed, 19 Oct 2022 07:10:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56917) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ol6xW-0001W4-4a for guix-patches@gnu.org; Wed, 19 Oct 2022 07:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ol6xV-0007Is-VG for guix-patches@gnu.org; Wed, 19 Oct 2022 07:10:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57861] [PATCH v2] gnu: Add ultrastar-deluxe. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Oct 2022 11:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57861 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 57861@debbugs.gnu.org Received: via spool by 57861-submit@debbugs.gnu.org id=B57861.166617776228020 (code B ref 57861); Wed, 19 Oct 2022 11:10:01 +0000 Received: (at 57861) by debbugs.gnu.org; 19 Oct 2022 11:09:22 +0000 Received: from localhost ([127.0.0.1]:55995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ol6ws-0007Hs-21 for submit@debbugs.gnu.org; Wed, 19 Oct 2022 07:09:22 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:53414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ol6wn-0007HZ-2v for 57861@debbugs.gnu.org; Wed, 19 Oct 2022 07:09:20 -0400 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4Msnzm59v6z9sWT; Wed, 19 Oct 2022 13:09:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1666177748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+S0Z6tnuqCKZSl+25DQPZt3xhxmaEGk7WPig8BJAnU8=; b=ayH/a80zvHlSkBWsPAt++JivJF13BFI9dClW1oWCQjpKqLtqu1Qkuc/fLremALBxB2ymQI FIWckvlzIyAgJ801idb6/6kI1V9vTHIxg46l29F7AOqktsAjq7Rlos6FUYsimzxR0Hib6I 5IMa3FDmfPkRW+GJNahblnmNCi6hEyInh0wK8tz0mRhqOMSAw3WlMLcGEujGnbkdR43+7a XHunGKDXdmY4V2Xwd87asA96HMFKhmQ1WUCN20TTeO/kctyTugOibRc58QctJkUo65QgZV 2dFTkEjWGWK1dN+dn1AWCz4/LO+b4qXjEUaZ3jiRXoXT+QPTJKuV0GmV2sQLlA== Date: Wed, 19 Oct 2022 13:09:06 +0200 From: Lars-Dominik Braun Message-ID: References: <87k04yhmq3.fsf_-_@gnu.org> <809300ae-6aee-7b0b-115c-49ee030ea030@telenet.be> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="X0xhKpiIPFQJGwf9" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <809300ae-6aee-7b0b-115c-49ee030ea030@telenet.be> X-Rspamd-Queue-Id: 4Msnzm59v6z9sWT X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1666177834; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=+S0Z6tnuqCKZSl+25DQPZt3xhxmaEGk7WPig8BJAnU8=; b=sgxkL5EtNtOQhONu5Kl4ZjMNN5qqulznjCD40vD+HmmhndSHNgWgb+7tyExt5c3x4S7/Ts FxDsc09WjU/JCQiIcMAEfk5SS30ROSiVl+Yn98wMBk6jmMghTN/iLFYDiqED87i5TpfyNX SKTOaRDQKM05SEjH6TLsWmYD7ZecslYgaOBDasEvGWXi+UMd1yy15vsQXMzPQHMnTPjnv5 oBjvRTbl2lbuysnDAd+CLMZy6z2cgZwj9iZzf7m1vU9EJLwNarIDFMeTumhqvy6eQZSZVp A9XM7vX5gZ+UxSEOSKaS0u6IXZ5uT27ZLKe7Op+j8js3fdHFiadUPZOfyUuiXA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1666177834; a=rsa-sha256; cv=none; b=G3VNTvY/AEEiL4qsIjoO1HqfeghPJ7iNL3P+TgaXqAIJpK3BEeALRDYJNZuW31L011bsFz WbhBF1MiaOHfSaV6e1r4lBvZak0DcoryGu8881YjcblqNs+2/HKeb/v0neNfer985k1JYv GXNLkcNM0EvBo2TJ/jUCsCdl/Oa4/TRNEEoNzYHw3O92Rv82Vxcu4OFtQ4HWPH7u+6O/Kk tmjoXW3TNiE4rmBFRw4ih7XTagmErFeH6ypPtV2W1JfG7F5XdL9qOvvf9p3P2obAG2/dVm N4P8FBfalyf5PBSvEg0q1CaqsmYRrQcdm2kq+h1VVBj6YMJk72INUdGDzFwzqg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=6xq.net header.s=MBO0001 header.b="ayH/a80z"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=6xq.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 7.37 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=6xq.net header.s=MBO0001 header.b="ayH/a80z"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=6xq.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: DFF809B9A X-Spam-Score: 7.37 X-Migadu-Scanner: scn1.migadu.com X-TUID: fpZ6i9Ao0Nbf --X0xhKpiIPFQJGwf9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Maxime, > You could give doing the resolve-module trick in (gnu packages pascal) a > try. or just #:autoload? The attached v2 seems to work at least. Lars --X0xhKpiIPFQJGwf9 Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0002-gnu-Add-ultrastar-deluxe.patch" Content-Transfer-Encoding: 8bit >From c542fd020cbf69fa319ea13301b80eedd35f34a3 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun 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. --- gnu/local.mk | 1 + gnu/packages/games.scm | 87 +++++++++++++++++++ .../ultrastar-deluxe-no-freesans.patch | 31 +++++++ 3 files changed, 119 insertions(+) create mode 100644 gnu/packages/patches/ultrastar-deluxe-no-freesans.patch diff --git a/gnu/local.mk b/gnu/local.mk index db76aa21e0..b94270e999 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1914,6 +1914,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 05901df782..a2d2d7db95 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -177,6 +177,7 @@ (define-module (gnu packages games) #:use-module (gnu packages ocaml) #:use-module (gnu packages opencl) #:use-module (gnu packages pcre) + #:autoload (gnu packages pascal) (fpc) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) #:use-module (gnu packages perl-compression) @@ -11159,6 +11160,92 @@ (define-public freerct and unsafe rides. Which path will you take?") (license license:gpl2))) +(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" (dirname (search-input-file inputs "lib/libz.so")) + " -L" (dirname (search-input-file inputs "lib/libX11.so")) + " -L" (dirname (search-input-file inputs "lib/libportmidi.so"))))))) + (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 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.37.3 --X0xhKpiIPFQJGwf9 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-fpc-Autoload-ld-wrapper.patch" >From 14ef2dcce25c47f05d8319edbcaf5de7b634bb39 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 19 Oct 2022 13:04:18 +0200 Subject: [PATCH v2 1/2] gnu: fpc: Autoload ld-wrapper. * gnu/packages/pascal.scm: Use #:autoload for ld-wrapper. --- gnu/packages/pascal.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/pascal.scm b/gnu/packages/pascal.scm index af7857f084..6749488f3f 100644 --- a/gnu/packages/pascal.scm +++ b/gnu/packages/pascal.scm @@ -28,7 +28,7 @@ (define-module (gnu packages pascal) #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages bootstrap) - #:use-module (gnu packages commencement) + #:autoload (gnu packages commencement) (ld-wrapper) #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages ncurses) -- 2.37.3 --X0xhKpiIPFQJGwf9--