[bug#64761] [PATCH] gnu: odamex: Update to 10.3.0.

[bug#64761] [PATCH] gnu: odamex: Update to 10.3.0.

[David Pflug]

* gnu/packages/games.scm (odamex): Update to 10.3.0
---
 gnu/packages/games.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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

[bug#64761] [PATCH v2] gnu: odamex: Update to 10.4.0.

[David Pflug]

* gnu/packages/games.scm (odamex): Update to 10.4.0.
---
 gnu/packages/games.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

[bug#64761] [PATCH] gnu: odamex: Update to 10.3.0.

[宋文武 via Guix-patches via]

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.

[bug#64761] [PATCH] gnu: odamex: Update to 10.3.0.

[David Pflug]

[-- Attachment #1: Type: text/plain, Size: 371 bytes --]

I'll see what I can do when I get some time.

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

> 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 #2: Type: text/html, Size: 739 bytes --]

[bug#64761] [PATCH v3] gnu: odamex: Update to 10.4.0.

[David Pflug]

* 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(-)

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

[bug#64761] [PATCH v3] gnu: odamex: Update to 10.4.0.

[Liliana Marie Prikler]

Am Samstag, dem 27.01.2024 um 09:41 -0500 schrieb David Pflug:
> * 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

bug#64761: [PATCH] gnu: odamex: Update to 10.3.0.

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 278 bytes --]


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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]