Received: (at submit) by debbugs.gnu.org; 1 Apr 2019 21:15:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 01 17:15:59 2019
Received: from localhost ([127.0.0.1]:39999 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1hB4Hc-0004IV-I3
for submit <at> debbugs.gnu.org; Mon, 01 Apr 2019 17:15:56 -0400
Received: from eggs.gnu.org ([209.51.188.92]:60697)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <nee-git@HIDDEN>) id 1hB4Ha-0004IE-7y
for submit <at> debbugs.gnu.org; Mon, 01 Apr 2019 17:15:54 -0400
Received: from lists.gnu.org ([209.51.188.17]:33808)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <nee-git@HIDDEN>)
id 1hB4HU-0004Dl-El
for submit <at> debbugs.gnu.org; Mon, 01 Apr 2019 17:15:48 -0400
Received: from eggs.gnu.org ([209.51.188.92]:46817)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <nee-git@HIDDEN>) id 1hB4HS-0006CL-LO
for guix-patches@HIDDEN; Mon, 01 Apr 2019 17:15:48 -0400
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level:
X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_NONE,
URIBL_BLOCKED autolearn=disabled version=3.3.2
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <nee-git@HIDDEN>) id 1hB4HQ-00046y-HG
for guix-patches@HIDDEN; Mon, 01 Apr 2019 17:15:46 -0400
Received: from pictor.uberspace.de ([95.143.172.207]:38888)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <nee-git@HIDDEN>)
id 1hB4HO-0003zG-NO
for guix-patches@HIDDEN; Mon, 01 Apr 2019 17:15:44 -0400
Received: (qmail 31753 invoked from network); 1 Apr 2019 21:15:31 -0000
Received: from localhost (HELO ?192.168.10.234?) (127.0.0.1)
by pictor.uberspace.de with SMTP; 1 Apr 2019 21:15:31 -0000
Subject: Re: [bug#34879] [PATCH] gnu: yamagi-quake2: Update to 7.40.
To: Tobias Geerinckx-Rice <me@HIDDEN>, guix-patches@HIDDEN
References: <e639cba0-aa53-c153-58cd-ce780b047e9f@HIDDEN>
<874l83be27.fsf@nckx>
From: nee <nee-git@HIDDEN>
Openpgp: preference=signencrypt
Autocrypt: addr=nee-git@HIDDEN; prefer-encrypt=mutual; keydata=
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
Message-ID: <3e8808c3-0dde-f149-9573-3525bb2f680f@HIDDEN>
Date: Mon, 1 Apr 2019 23:15:28 +0200
MIME-Version: 1.0
In-Reply-To: <874l83be27.fsf@nckx>
Content-Type: multipart/mixed; boundary="------------B9E7CCC7AA858361D07EC145"
Content-Language: en-GB
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-Received-From: 95.143.172.207
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This is a multi-part message in MIME format.
--------------B9E7CCC7AA858361D07EC145
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Hello, thank you for the review!
Am 16.03.19 um 06:09 schrieb Tobias Geerinckx-Rice:
> This version completely changes how it loads OpenAL. The attached patch
> keeps everything working, but embeds an absolute store reference in the
> user's configuration file after the first run:>
> λ grep /gnu/store ~/.yq2/baseq2/config.cfg set al_driver
> "/gnu/store/…-openal-1.19.1/lib/libopenal.so.1"
Good job spotting that, how do you get it to generate that though? I
thought I didn't have it, because I had an old config, but now I moved
mine and it still doesn't appear.
Anyway, I looked at the code and curl seems to load the same way.
>
> Any ideas, anyone?
>
I think it's the best to just hard-code the path where it loads those
libraries. That prevents it from loading outdated or garbage collected
ones before the compiled one. Also curl doesn't have a default fallback
in the Makefile.
Try the new patch and do this to the config:
echo 'set al_driver "/tmp/non-existing-garbage-collected-library"' >>
~/.yq2/baseq2/config.cfg
echo 'set cl_libcurl "/tmp/non-existing-garbage-collected-library"' >>
~/.yq2/baseq2/config.cfg
I tested this new patch and the old patch, and the new one works while
the old one logs to stdout that failed to load curl and openal with that
config and falls back to sdl-audio.
Happy hacking!
--------------B9E7CCC7AA858361D07EC145
Content-Type: text/x-patch;
name="0001-gnu-yamagi-quake2-Update-to-7.40.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="0001-gnu-yamagi-quake2-Update-to-7.40.patch"
=46rom a268a6d5390e562f4ed5cc28784f7d83a2eb6f9d Mon Sep 17 00:00:00 2001
From: nee <nee-git@HIDDEN>
Date: Fri, 15 Mar 2019 20:56:47 +0100
Subject: [PATCH] gnu: yamagi-quake2: Update to 7.40.
* gnu/packages/games.scm (yamagi-quake2): Update to 7.40.
[arguments](phases): Add 'hard-code-dynamicly-loaded-libs phase.
[inputs]: Add curl.
---
gnu/packages/games.scm | 34 +++++++++++++++++++++++-----------
1 file changed, 23 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 46b58e352c..69e259f044 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5023,7 +5023,7 @@ some graphical niceities, and numerous bug-fixes an=
d other improvements.")
(define-public yamagi-quake2
(package
(name "yamagi-quake2")
- (version "7.10")
+ (version "7.40")
(source
(origin
(method url-fetch)
@@ -5031,28 +5031,39 @@ some graphical niceities, and numerous bug-fixes =
and other improvements.")
version ".tar.xz"))
(sha256
(base32
- "0psinbg25mysd58k99s1n34w31w5hj1vppb39gdjb0zqi6sl6cps"))))
+ "0aci73r15m1wbkrhpysxzdg77a294ywxfkd141gi5qgc2lwbsbqw"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f
#:make-flags
(list "CC=3Dgcc"
- ;; link openAL instead of using dlopen at runtime
- "DLOPEN_OPENAL=3D\"no\""
- ;; an optional directory where it will look for quake2 data=
files
- ;; in addition to the current working directory
+ ;; An optional directory where it will look for quake2 data=
files
+ ;; In addition to the current working directory
"WITH_SYSTEMWIDE=3Dyes"
"WITH_SYSTEMDIR=3D\"/opt/quake2\"")
#:phases
(modify-phases %standard-phases
(delete 'configure)
+ (add-before 'build 'hard-code-dynamicly-loaded-libs
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; The game writes paths to openal.so and curl.so to ~/.yq2=
/...
+ ;; Workaround: hard-code the compiled paths where it load t=
hem,
+ ;; this prevents loading old or a garbage collected librari=
es
+ (substitute* "src/client/sound/qal.c"
+ (("al_driver->string")
+ (string-append "\""(assoc-ref inputs "openal")
+ "/lib/libopenal.so\"")))
+ (substitute* "src/client/curl/qcurl.c"
+ (("cl_libcurl->string")
+ (string-append "\"" (assoc-ref inputs "curl")
+ "/lib/libcurl.so\"")))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/lib"))
(mkdir-p (string-append out "/bin"))
;; The yamagi-quake2 binary must be in the same directory=
- ;; as it's engine libraries, but symlinking it to /bin is=
okay
+ ;; as its engine libraries, but symlinking it to /bin is =
okay
;; https://github.com/yquake2/yquake2/blob/master/stuff/p=
ackaging.md
(copy-recursively "release"
(string-append out "/lib/yamagi-quake2"=
))
@@ -5060,11 +5071,12 @@ some graphical niceities, and numerous bug-fixes =
and other improvements.")
(string-append out "/bin/yamagi-quake2"))
(symlink (string-append out "/lib/yamagi-quake2/q2ded")
(string-append out "/bin/yamagi-q2ded"))))))))
- (inputs `(("sdl2" ,sdl2)
- ("mesa" ,mesa)
+ (inputs `(("curl" ,curl)
("libvorbis" ,libvorbis)
- ("zlib" ,zlib)
- ("openal" ,openal)))
+ ("mesa" ,mesa)
+ ("openal" ,openal)
+ ("sdl2" ,sdl2)
+ ("zlib" ,zlib)))
(native-inputs `(("pkg-config" ,pkg-config)))
(synopsis "First person shooter engine based on quake2")
(description "Yamagi Quake II is an enhanced client for id Software'=
s Quake II.
--=20
2.20.1
--------------B9E7CCC7AA858361D07EC145--
guix-patches@HIDDEN:bug#34879; Package guix-patches.
Full text available.
Received: (at 34879) by debbugs.gnu.org; 16 Mar 2019 05:10:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 16 01:10:04 2019
Received: from localhost ([127.0.0.1]:45737 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1h51a7-0000Hx-Ey
for submit <at> debbugs.gnu.org; Sat, 16 Mar 2019 01:10:03 -0400
Received: from tobias.gr ([80.241.217.52]:56860)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <me@HIDDEN>) id 1h51a4-0000HJ-N7
for 34879 <at> debbugs.gnu.org; Sat, 16 Mar 2019 01:10:02 -0400
Received: by tobias.gr (OpenSMTPD) with ESMTP id 63adb7da;
Sat, 16 Mar 2019 05:09:51 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to:cc
:subject:references:in-reply-to:date:message-id:mime-version
:content-type; s=2018; i=me@HIDDEN; bh=vPHCUl6HLgveRFQzq13K/v
bSipNYvbcGKiivktkhBxQ=; b=WWBN+0fmwgTUaRqwrSjtNP5uBs/mJodT7z2FXd
YmAY6/i8XRye9cvhme501h1WSZe5mvyJUVPKAui6w5I5SqCKOaap8PncjC1VwRlj
ylGDcyY7D+Y34tx5WvOMTKladNuLqZ2hGkPlPKGnfTPRLGNDfg0heeSscvUIoivN
4gnBYtrXMNJ5OCp2YDgtvPVn0GHRdAMZh5MYcaWCeE6n3UQwHtomS0GWgovli0Zm
7IFZfnmHabsmvaDusuKp1IYwMfqTPf46GFmrt84AKKVpzHEOJQ0woq6jI90LhOwM
kyZ/Q9sEJGGN+KzSKlamEfNe9Y/Mv1XFuNiFmLRJpjVWi20g==
Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 5f251348
(TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO);
Sat, 16 Mar 2019 05:09:41 +0000 (UTC)
From: Tobias Geerinckx-Rice <me@HIDDEN>
To: nee <nee-git@HIDDEN>
Subject: Re: [bug#34879] [PATCH] gnu: yamagi-quake2: Update to 7.40.
References: <e639cba0-aa53-c153-58cd-ce780b047e9f@HIDDEN>
In-reply-to: <e639cba0-aa53-c153-58cd-ce780b047e9f@HIDDEN>
Date: Sat, 16 Mar 2019 06:09:36 +0100
Message-ID: <874l83be27.fsf@nckx>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 34879
Cc: 34879 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
--=-=-=
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: quoted-printable
nee wrote:
> Subject: [PATCH] gnu: yamagi-quake2: Update to 7.40.
It's unfortunately not that simple. :-(
This version completely changes how it loads OpenAL. The attached=20
patch keeps everything working, but embeds an absolute store=20
reference in the user's configuration file after the first run:
=CE=BB grep /gnu/store ~/.yq2/baseq2/config.cfg=20
set al_driver "/gnu/store/=E2=80=A6-openal-1.19.1/lib/libopenal.so.1"
Any ideas, anyone?
T G-R
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline;
filename=0001-gnu-yamagi-quake2-Update-to-7.40.patch
From 0048a70ed05f704e2d620c5033bbb0799d025afc Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@HIDDEN>
Date: Fri, 15 Feb 2019 05:26:34 +0100
Subject: [PATCH 01/25] gnu: yamagi-quake2: Update to 7.40.
* gnu/packages/games.scm (yamagi-quake2): Update to 7.40.
[arguments]: Drop removed DLOPEN_OPENAL from #:make-flags and add a new
'embed-library-path' phase to link it by hand.
[inputs]: Add curl.
---
gnu/packages/games.scm | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 46b58e352c..e7102a0403 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5023,36 +5023,43 @@ some graphical niceities, and numerous bug-fixes and other improvements.")
(define-public yamagi-quake2
(package
(name "yamagi-quake2")
- (version "7.10")
+ (version "7.40")
(source
(origin
(method url-fetch)
(uri (string-append "https://deponie.yamagi.org/quake2/quake2-"
version ".tar.xz"))
(sha256
- (base32
- "0psinbg25mysd58k99s1n34w31w5hj1vppb39gdjb0zqi6sl6cps"))))
+ (base32 "0aci73r15m1wbkrhpysxzdg77a294ywxfkd141gi5qgc2lwbsbqw"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f
#:make-flags
(list "CC=gcc"
- ;; link openAL instead of using dlopen at runtime
- "DLOPEN_OPENAL=\"no\""
- ;; an optional directory where it will look for quake2 data files
- ;; in addition to the current working directory
+ ;; An optional directory where it will look for quake2 data files
+ ;; in addition to the current working directory.
"WITH_SYSTEMWIDE=yes"
"WITH_SYSTEMDIR=\"/opt/quake2\"")
#:phases
(modify-phases %standard-phases
- (delete 'configure)
+ (delete 'configure) ; no configure script
+ (add-after 'unpack 'embed-library-path
+ ;; The option (DLOPEN_OPENAL=no) to link the OpenAL library at
+ ;; compile time was removed. Pass an absolute file name to
+ ;; Sys_LoadLibrary to emulate it.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((openal (assoc-ref inputs "openal")))
+ (substitute* "Makefile"
+ (("libopenal\\.so\\.[^\"]*" name)
+ (string-append openal "/lib/" name)))
+ #t)))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(mkdir-p (string-append out "/lib"))
(mkdir-p (string-append out "/bin"))
;; The yamagi-quake2 binary must be in the same directory
- ;; as it's engine libraries, but symlinking it to /bin is okay
+ ;; as its engine libraries, but symlinking it to /bin is okay.
;; https://github.com/yquake2/yquake2/blob/master/stuff/packaging.md
(copy-recursively "release"
(string-append out "/lib/yamagi-quake2"))
@@ -5060,7 +5067,8 @@ some graphical niceities, and numerous bug-fixes and other improvements.")
(string-append out "/bin/yamagi-quake2"))
(symlink (string-append out "/lib/yamagi-quake2/q2ded")
(string-append out "/bin/yamagi-q2ded"))))))))
- (inputs `(("sdl2" ,sdl2)
+ (inputs `(("curl" ,curl)
+ ("sdl2" ,sdl2)
("mesa" ,mesa)
("libvorbis" ,libvorbis)
("zlib" ,zlib)
--
2.20.1
--=-=-=--
guix-patches@HIDDEN:bug#34879; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 16 Mar 2019 00:34:46 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Mar 15 20:34:46 2019
Received: from localhost ([127.0.0.1]:45669 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1h4xHh-0008Db-Nr
for submit <at> debbugs.gnu.org; Fri, 15 Mar 2019 20:34:45 -0400
Received: from eggs.gnu.org ([209.51.188.92]:33103)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <nee-git@HIDDEN>) id 1h4wLs-0006iq-5S
for submit <at> debbugs.gnu.org; Fri, 15 Mar 2019 19:35:00 -0400
Received: from lists.gnu.org ([209.51.188.17]:54000)
by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <nee-git@HIDDEN>)
id 1h4wLm-0007DK-RK
for submit <at> debbugs.gnu.org; Fri, 15 Mar 2019 19:34:55 -0400
Received: from eggs.gnu.org ([209.51.188.92]:47450)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <nee-git@HIDDEN>) id 1h4wLj-0003jw-3D
for guix-patches@HIDDEN; Fri, 15 Mar 2019 19:34:54 -0400
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level:
X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_40,RCVD_IN_DNSWL_NONE,
URIBL_BLOCKED autolearn=disabled version=3.3.2
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <nee-git@HIDDEN>) id 1h4w6W-0006wh-Df
for guix-patches@HIDDEN; Fri, 15 Mar 2019 19:19:10 -0400
Received: from pictor.uberspace.de ([95.143.172.207]:35028)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <nee-git@HIDDEN>)
id 1h4w6T-0006vI-Vv
for guix-patches@HIDDEN; Fri, 15 Mar 2019 19:19:06 -0400
Received: (qmail 24930 invoked from network); 15 Mar 2019 23:19:03 -0000
Received: from localhost (HELO ?192.168.10.234?) (127.0.0.1)
by pictor.uberspace.de with SMTP; 15 Mar 2019 23:19:03 -0000
From: nee <nee-git@HIDDEN>
Subject: [PATCH] gnu: yamagi-quake2: Update to 7.40.
Openpgp: preference=signencrypt
Autocrypt: addr=nee-git@HIDDEN; prefer-encrypt=mutual; keydata=
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
To: guix-patches@HIDDEN
Message-ID: <e639cba0-aa53-c153-58cd-ce780b047e9f@HIDDEN>
Date: Sat, 16 Mar 2019 00:19:01 +0100
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------4018D98B7931257378A3B4B6"
Content-Language: en-GB
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-Received-From: 95.143.172.207
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: submit
X-Mailman-Approved-At: Fri, 15 Mar 2019 20:34:44 -0400
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This is a multi-part message in MIME format.
--------------4018D98B7931257378A3B4B6
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
--------------4018D98B7931257378A3B4B6
Content-Type: text/x-patch;
name="0001-gnu-yamagi-quake2-Update-to-7.40.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="0001-gnu-yamagi-quake2-Update-to-7.40.patch"
=46rom 5e4226b938a4a1af2db3dcc9db0f637ed1dbd4cd Mon Sep 17 00:00:00 2001
From: nee <nee-git@HIDDEN>
Date: Fri, 15 Mar 2019 20:56:47 +0100
Subject: [PATCH] gnu: yamagi-quake2: Update to 7.40.
* gnu/packages/games.scm (yamagi-quake2): Update to 7.40.
[inputs]: Add curl.
---
gnu/packages/games.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 46b58e352c..2ad9cebf50 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5023,7 +5023,7 @@ some graphical niceities, and numerous bug-fixes an=
d other improvements.")
(define-public yamagi-quake2
(package
(name "yamagi-quake2")
- (version "7.10")
+ (version "7.40")
(source
(origin
(method url-fetch)
@@ -5031,7 +5031,7 @@ some graphical niceities, and numerous bug-fixes an=
d other improvements.")
version ".tar.xz"))
(sha256
(base32
- "0psinbg25mysd58k99s1n34w31w5hj1vppb39gdjb0zqi6sl6cps"))))
+ "0aci73r15m1wbkrhpysxzdg77a294ywxfkd141gi5qgc2lwbsbqw"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f
@@ -5064,6 +5064,7 @@ some graphical niceities, and numerous bug-fixes an=
d other improvements.")
("mesa" ,mesa)
("libvorbis" ,libvorbis)
("zlib" ,zlib)
+ ("curl" ,curl)
("openal" ,openal)))
(native-inputs `(("pkg-config" ,pkg-config)))
(synopsis "First person shooter engine based on quake2")
--=20
2.20.1
--------------4018D98B7931257378A3B4B6--
nee <nee-git@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#34879; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.