[PATCH] gnu: yamagi-quake2: Update to 7.40.

  • Done
  • quality assurance status badge
Details
3 participants
  • Maxim Cournoyer
  • Tobias Geerinckx-Rice
  • nee
Owner
unassigned
Submitted by
nee
Severity
normal
N
N
nee wrote on 16 Mar 2019 00:19
(address . guix-patches@gnu.org)
e639cba0-aa53-c153-58cd-ce780b047e9f@hidamari.blue

From 5e4226b938a4a1af2db3dcc9db0f637ed1dbd4cd Mon Sep 17 00:00:00 2001
From: nee <nee-git@hidamari.blue>
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(-)

Toggle diff (32 lines)
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 and 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 and 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 and 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")
--
2.20.1
T
T
Tobias Geerinckx-Rice wrote on 16 Mar 2019 06:09
(name . nee)(address . nee-git@hidamari.blue)(address . 34879@debbugs.gnu.org)
874l83be27.fsf@nckx
nee wrote:
Toggle quote (2 lines)
> 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
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"

Any ideas, anyone?

T G-R
From 0048a70ed05f704e2d620c5033bbb0799d025afc Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
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(-)

Toggle diff (69 lines)
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
N
N
nee wrote on 1 Apr 2019 23:15
3e8808c3-0dde-f149-9573-3525bb2f680f@hidamari.blue
Hello, thank you for the review!

Am 16.03.19 um 06:09 schrieb Tobias Geerinckx-Rice:
Toggle quote (6 lines)
> 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.

Toggle quote (3 lines)
>
> 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!
From a268a6d5390e562f4ed5cc28784f7d83a2eb6f9d Mon Sep 17 00:00:00 2001
From: nee <nee-git@hidamari.blue>
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(-)

Toggle diff (78 lines)
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 and 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=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)
+ (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 them,
+ ;; this prevents loading old or a garbage collected libraries
+ (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/packaging.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.
--
2.20.1
M
M
Maxim Cournoyer wrote on 6 Aug 2021 06:04
Re: bug#34879: [PATCH] gnu: yamagi-quake2: Update to 7.40.
(name . nee)(address . nee-git@hidamari.blue)
87bl6bkyl7.fsf_-_@gmail.com
Hi!

nee <nee-git@hidamari.blue> writes:

[...]

Toggle quote (40 lines)
> 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!
>
> From a268a6d5390e562f4ed5cc28784f7d83a2eb6f9d Mon Sep 17 00:00:00 2001
> From: nee <nee-git@hidamari.blue>
> 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 and other improvements.")
> (define-public yamagi-quake2
> (package
> (name "yamagi-quake2")
> - (version "7.10")
> + (version "7.40")

We're now at 7.45 on master but loading the OpenAL library was
failing...

[...]

Toggle quote (25 lines)
> - ;; 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)
> + (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 them,
> + ;; this prevents loading old or a garbage collected libraries
> + (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\"")))))

... until I applied the above forgotten patch! Finally applied as
c64c49b152.

Thank you!

Closing.

Maxim
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 34879@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 34879
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch