GNU bug report logs - #64761
[PATCH] gnu: odamex: Update to 10.3.0.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 64761 in the body.
You can then email your comments to 64761 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: David Pflug <david <at> pflug.io>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: odamex: Update to 10.3.0.
Date: Thu, 20 Jul 2023 20:41:51 -0400

* 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 <at> posteo.net>
 ;;; Copyright © 2021 Stefan Reichör <stefan <at> xsteve.at>
 ;;; Copyright © 2021, 2022 Greg Hogan <code <at> greghogan.com>
-;;; Copyright © 2021 David Pflug <david <at> pflug.io>
+;;; Copyright © 2021, 2023 David Pflug <david <at> pflug.io>
 ;;; Copyright © 2021, 2022 Felix Gruber <felgru <at> posteo.net>
 ;;; Copyright © 2021 Solene Rapenne <solene <at> perso.pw>
 ;;; Copyright © 2021, 2022 Noisytoot <ron <at> 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

Message #8 received at 64761 <at> debbugs.gnu.org (full text, mbox):

From: David Pflug <david <at> pflug.io>
To: 64761 <at> debbugs.gnu.org
Cc: David Pflug <david <at> pflug.io>
Subject: [PATCH v2] gnu: odamex: Update to 10.4.0.
Date: Sat, 12 Aug 2023 07:35:46 -0400

* 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 <at> posteo.net>
 ;;; Copyright © 2021 Stefan Reichör <stefan <at> xsteve.at>
 ;;; Copyright © 2021, 2022 Greg Hogan <code <at> greghogan.com>
-;;; Copyright © 2021 David Pflug <david <at> pflug.io>
+;;; Copyright © 2021, 2023 David Pflug <david <at> pflug.io>
 ;;; Copyright © 2021, 2022 Felix Gruber <felgru <at> posteo.net>
 ;;; Copyright © 2021 Solene Rapenne <solene <at> perso.pw>
 ;;; Copyright © 2021, 2022 Noisytoot <ron <at> 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

Message #11 received at 64761 <at> debbugs.gnu.org (full text, mbox):

From: 宋文武 <iyzsong <at> envs.net>
To: David Pflug <david <at> pflug.io>
Cc: 64761 <at> debbugs.gnu.org
Subject: Re: bug#64761: [PATCH] gnu: odamex: Update to 10.3.0.
Date: Sun, 13 Aug 2023 14:55:39 +0800

David Pflug <david <at> 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.

Message #14 received at 64761 <at> debbugs.gnu.org (full text, mbox):

From: David Pflug <david <at> pflug.io>
To: 宋文武 <iyzsong <at> envs.net>
Cc: 64761 <at> debbugs.gnu.org
Subject: Re: bug#64761: [PATCH] gnu: odamex: Update to 10.3.0.
Date: Sun, 13 Aug 2023 09:17:29 -0400

[Message part 1 (text/plain, inline)]

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

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

> David Pflug <david <at> 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.
>

[Message part 2 (text/html, inline)]

Message #19 received at 64761 <at> debbugs.gnu.org (full text, mbox):

From: David Pflug <david <at> pflug.io>
To: 64761 <at> debbugs.gnu.org
Cc: David Pflug <david <at> pflug.io>
Subject: [PATCH v3] gnu: odamex: Update to 10.4.0.
Date: Sat, 27 Jan 2024 09:41:58 -0500

* 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 <at> posteo.net>
 ;;; Copyright © 2021 Stefan Reichör <stefan <at> xsteve.at>
 ;;; Copyright © 2021, 2022 Greg Hogan <code <at> greghogan.com>
-;;; Copyright © 2021 David Pflug <david <at> pflug.io>
+;;; Copyright © 2021, 2024 David Pflug <david <at> pflug.io>
 ;;; Copyright © 2021, 2022 Felix Gruber <felgru <at> posteo.net>
 ;;; Copyright © 2021 Solene Rapenne <solene <at> perso.pw>
 ;;; Copyright © 2021, 2022 Noisytoot <ron <at> 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

Message #22 received at 64761 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: David Pflug <david <at> pflug.io>, 64761 <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> envs.net>
Subject: Re: [bug#64761] [PATCH v3] gnu: odamex: Update to 10.4.0.
Date: Sat, 27 Jan 2024 16:28:06 +0100

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

Message #27 received at 64761-done <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 64761-done <at> debbugs.gnu.org
Subject: [PATCH] gnu: odamex: Update to 10.3.0.
Date: Sat, 10 Feb 2024 16:07:41 +0000

[Message part 1 (text/plain, inline)]

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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.