[PATCH] gnu: odamex: Update to 10.3.0.

  • Done
  • quality assurance status badge
Details
5 participants
  • David Pflug
  • ???
  • Liliana Marie Prikler
  • Christopher Baines
  • Sharlatan Hellseher
Owner
unassigned
Submitted by
David Pflug
Severity
normal
D
D
David Pflug wrote on 21 Jul 2023 02:41
(address . guix-patches@gnu.org)
CAB3eSakD5p+Gr5bBmr_--bu3Qh=Pfx4th24MAFKzJBKnYejLLg@mail.gmail.com
* gnu/packages/games.scm (odamex): Update to 10.3.0
---
gnu/packages/games.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

Toggle diff (40 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index ec084553da..6a34693a0c 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -60,7 +60,7 @@
;;; Copyright © 2021 Olivier Rojon <o.rojon@posteo.net>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021, 2022 Greg Hogan <code@greghogan.com>
-;;; Copyright © 2021 David Pflug <david@pflug.io>
+;;; Copyright © 2021, 2023 David Pflug <david@pflug.io>
;;; Copyright © 2021, 2022 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
;;; Copyright © 2021, 2022 Noisytoot <ron@noisytoot.org>
@@ -7879,19 +7879,20 @@ (define-public gzdoom
(define-public odamex
(package
(name "odamex")
- (version "0.9.5")
+ (version "10.3.0")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://sourceforge/odamex/Odamex/" version "/"
- "odamex-src-" version ".tar.bz2"))
+ "odamex-src-" version ".tar.zstd"))
(sha256
- (base32 "1x0c9vnwn336inkfamh4na8xjyfjmzfxfn49j4snqymkypjqw6jq"))))
+ (base32 "1wws74hrc816raj9wbwmhi7q1arzjv0fxssdgbyppy0zh7zg5abh"))))
(build-system cmake-build-system)
(arguments `(#:tests? #f)) ; no tests
(native-inputs
- (list deutex))
+ (list deutex
+ zstd))
(inputs
`(("sdl" ,sdl2)
("sdl-mixer" ,sdl2-mixer)
--
2.41.0
D
D
David Pflug wrote on 12 Aug 2023 13:35
[PATCH v2] gnu: odamex: Update to 10.4.0.
(address . 64761@debbugs.gnu.org)(name . David Pflug)(address . david@pflug.io)
20230812113604.3268-1-david@pflug.io
* gnu/packages/games.scm (odamex): Update to 10.4.0.
---
gnu/packages/games.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (36 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index bf5c680042..8c086d6a39 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -60,7 +60,7 @@
;;; Copyright © 2021 Olivier Rojon <o.rojon@posteo.net>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021, 2022 Greg Hogan <code@greghogan.com>
-;;; Copyright © 2021 David Pflug <david@pflug.io>
+;;; Copyright © 2021, 2023 David Pflug <david@pflug.io>
;;; Copyright © 2021, 2022 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
;;; Copyright © 2021, 2022 Noisytoot <ron@noisytoot.org>
@@ -7878,15 +7878,15 @@ (define-public gzdoom
(define-public odamex
(package
(name "odamex")
- (version "0.9.5")
+ (version "10.4.0")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://sourceforge/odamex/Odamex/" version "/"
- "odamex-src-" version ".tar.bz2"))
+ "odamex-src-" version ".tar.gz"))
(sha256
- (base32 "1x0c9vnwn336inkfamh4na8xjyfjmzfxfn49j4snqymkypjqw6jq"))))
+ (base32 "1i5dz96dfjqnm6fh5ri77phln4l6l3d03wy7gyr717p35hs4yj1m"))))
(build-system cmake-build-system)
(arguments `(#:tests? #f)) ; no tests
(native-inputs

base-commit: a38ebae09cd7cbaeaafdaaf9a1cef73752a891c8
--
2.41.0
?
?
??? wrote on 13 Aug 2023 08:55
Re: bug#64761: [PATCH] gnu: odamex: Update to 10.3.0.
(name . David Pflug)(address . david@pflug.io)(address . 64761@debbugs.gnu.org)
87leefa0t0.fsf_-_@envs.net
David Pflug <david@pflug.io> writes:

Toggle quote (2 lines)
> * gnu/packages/games.scm (odamex): Update to 10.4.0.

Hello, it seems to me that this package built with bundled fltk,
jsoncpp, protobuf and miniupnp. Any chance to unbundle them?

Thanks.
D
D
David Pflug wrote on 13 Aug 2023 15:17
(name . ???)(address . iyzsong@envs.net)(address . 64761@debbugs.gnu.org)
CAB3eSamjqJKdvFmVkWhAQgYObfU_g+PTTKwM7TBZKJ71FCOa7w@mail.gmail.com
I'll see what I can do when I get some time.

On Sun, Aug 13, 2023, 2:55 AM ??? <iyzsong@envs.net> wrote:

Toggle quote (9 lines)
> David Pflug <david@pflug.io> writes:
>
> > * gnu/packages/games.scm (odamex): Update to 10.4.0.
>
> Hello, it seems to me that this package built with bundled fltk,
> jsoncpp, protobuf and miniupnp. Any chance to unbundle them?
>
> Thanks.
>
Attachment: file
C
C
Christopher Baines wrote on 27 Aug 2023 19:53
tag 64761 moreinfo
(address . control@debbugs.gnu.org)
87bkes8j8e.fsf@cbaines.net
tags 64761 + moreinfo
quit
D
D
David Pflug wrote on 27 Jan 15:41 +0100
[PATCH v3] gnu: odamex: Update to 10.4.0.
(address . 64761@debbugs.gnu.org)(name . David Pflug)(address . david@pflug.io)
832681d137a16d729637f875282aa1147ad8d045.1706366518.git.david@pflug.io
* gnu/packages/games.scm (odamex): Update to 10.4.0.

I don't really know CMake, but ldd says all the libraries are from other parts of /gnu/store, so I *think* this unbundles? I'm not sure if that's the best way to check.

Change-Id: I371d18498640e15a7bfae527fea12d9432368f50
---
gnu/packages/games.scm | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)

Toggle diff (58 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c6aa873ac7..45541598c5 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -60,7 +60,7 @@
;;; Copyright © 2021 Olivier Rojon <o.rojon@posteo.net>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021, 2022 Greg Hogan <code@greghogan.com>
-;;; Copyright © 2021 David Pflug <david@pflug.io>
+;;; Copyright © 2021, 2024 David Pflug <david@pflug.io>
;;; Copyright © 2021, 2022 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
;;; Copyright © 2021, 2022 Noisytoot <ron@noisytoot.org>
@@ -8096,26 +8096,31 @@ (define-public gzdoom
(define-public odamex
(package
(name "odamex")
- (version "0.9.5")
+ (version "10.4.0")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://sourceforge/odamex/Odamex/" version "/"
- "odamex-src-" version ".tar.bz2"))
+ "odamex-src-" version ".tar.xz"))
(sha256
- (base32 "1x0c9vnwn336inkfamh4na8xjyfjmzfxfn49j4snqymkypjqw6jq"))))
+ (base32 "1isrmki18471yry48mmm7lxzp1kiqma9cc7fx38cvpm2mpgfyvzk"))))
(build-system cmake-build-system)
- (arguments `(#:tests? #f)) ; no tests
+ (arguments `(#:tests? #f))
(native-inputs
(list deutex))
(inputs
- `(("sdl" ,sdl2)
- ("sdl-mixer" ,sdl2-mixer)
- ("zlib" ,zlib)
- ("libpng" ,libpng)
+ `(("alsa-lib" ,alsa-lib)
("curl" ,curl)
- ("alsa-lib" ,alsa-lib)))
+ ("fltk" ,fltk)
+ ("jsoncpp" ,jsoncpp)
+ ("libpng" ,libpng)
+ ("miniupnpc" ,miniupnpc)
+ ("portmidi" ,portmidi)
+ ("protobuf" ,protobuf)
+ ("sdl" ,sdl2)
+ ("sdl-mixer" ,sdl2-mixer)
+ ("zlib" ,zlib)))
(home-page "https://odamex.net/")
(synopsis "Multiplayer Doom port")
(description "Odamex is a modification of the Doom engine that

base-commit: 3821ee62ccfe21b83d82f313c84497dd9980a0e6
--
2.41.0
L
L
Liliana Marie Prikler wrote on 27 Jan 16:28 +0100
(name . ???)(address . iyzsong@envs.net)
b553f0bd09752da4001d7ad768a33a41160a81f2.camel@gmail.com
Am Samstag, dem 27.01.2024 um 09:41 -0500 schrieb David Pflug:
Toggle quote (8 lines)
> * gnu/packages/games.scm (odamex): Update to 10.4.0.
>
> I don't really know CMake, but ldd says all the libraries are from
> other parts of /gnu/store, so I *think* this unbundles? I'm not sure
> if that's the best way to check.
>
> Change-Id: I371d18498640e15a7bfae527fea12d9432368f50
> ---
You could delete the local sources with a snippet to make sure.

Cheers
S
S
Sharlatan Hellseher wrote on 10 Feb 17:07 +0100
[PATCH] gnu: odamex: Update to 10.3.0.
(address . 64761-done@debbugs.gnu.org)
87le7sqp4i.fsf@gmail.com
Hi,

Update to 10.3.0 pushed as 6aefab6c0c5e9656572ce0ad8d9d41e27cb17071 to master.

I've unbundled some libs, but more work required to proper replace remaining
bundled libraries.

Unbundle some libs and remove labels pushed as 54592df80d..6a59d3ad68 to
master.

Thanks,
Oleg
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmXHn00ACgkQdtcnv/Ys
0rW7ZxAAr7Y7aiGr+zmkiXdEDXR4xoZuzuC1zEOjOlsqzqxxh27Z3mT4mLmIV5pC
IwbeWm30W+qZCzQgzvGLrSTcRpMilSo23XuKjA98I6P4lq1Mxn0h7jXbQL1tMuOg
85qmlu9RARKiwgH7UdbZ5noV5pxEePWd6UVCOH+Jn2xgsNULWeZZOKN+bRUzqHeu
eurytxMxwN/eKA2y7yjA9FEhn6CnT3a1eEgdE6ci6lyiFG66Xnx3yoqrd55hJr1E
WWFVouS5gX89A2MHp+EgRzfOwjo2qQQ69lhT39fjFfY/DK00GnLBtyDMNuFzDD2X
rl7wbATOtwag/sonX9tr+9bIbybNjGjz9Cx46WsKO9Di9Enbffv+j03sHY+5/lxo
lEh/n0Q32sHSNEnb0gMGq13kGwrAUXcdy4kC4NbyRMh7rgsrnC95ZpMNaYmh+dKH
x8RMCcr3SOmY36To7qsD/D0qYuvNsfxuQUhD7mObyWuirGklQEgCByPREFO4NkN2
uM8MOFai1frA7vPOZrHmgjrHWlo4VWaAGvvaHMpoCU3ywTGj0J9HHen2Ao5mkZ1m
diov1dvhIHmO5HcTZL5Xbf9DQ3CBwRymNL9M13IlRuXqNCEWOZHDMAANiRWyN6bB
EHUPYNdD3u725oM3iy7gbCNrA3VINojuvg0OajMotURo/8eKGVw=
=ohx5
-----END PGP SIGNATURE-----

Closed
?