[PATCH] gnu: audacious: Update to 4.1.

  • Done
  • quality assurance status badge
Details
2 participants
  • Felix Gruber
  • Nicolas Goaziou
Owner
unassigned
Submitted by
Felix Gruber
Severity
normal
F
F
Felix Gruber wrote on 2 Aug 2021 00:14
(address . guix-patches@gnu.org)(name . Felix Gruber)(address . felgru@posteo.net)
20210801221446.34588-1-felgru@posteo.net
* gnu/packages/music.scm (audacious): Update to 4.1.
[inputs]: Add gtk+-2 and replace libmodplug with libopenmpt.
---
gnu/packages/music.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

Toggle diff (57 lines)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 9c69204610..ef9f78ffbe 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -40,6 +40,7 @@
;;; Copyright © 2021 Frank Pursel <frank.pursel@gmail.com>
;;; Copyright © 2021 Rovanion Luckey <rovanion.luckey@gmail.com>
;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li>
+;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -177,14 +178,14 @@
(define-public audacious
(package
(name "audacious")
- (version "4.0.5")
+ (version "4.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://distfiles.audacious-media-player.org/"
"audacious-" version ".tar.bz2"))
(sha256
- (base32 "028zjgz0p7ys15lk2a30m5zcv9xrx3ga50wjsh4m4zxilgkakbji"))))
+ (base32 "0p734psjjvjcmla2hg5h6a9v1prvy63jj9xm2g2ngs49jy7qan0z"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -228,12 +229,13 @@
(uri (string-append "https://distfiles.audacious-media-player.org/"
"audacious-plugins-" version ".tar.bz2"))
(sha256
- (base32 "0ny5w1agr9jaz5w3wyyxf1ygmzmd1sivaf97lcm4z4w6529520lz"))))
+ (base32 "0k0xnqmxi5lna034i2cnzvfzrykxmv4fbs1nkrc9sd2ma1igrmns"))))
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for gdbus-codegen
("pkg-config" ,pkg-config)))
(inputs
`(("dbus" ,dbus)
+ ("gtk+" ,gtk+-2)
("qtbase" ,qtbase-5)
("qtmultimedia" ,qtmultimedia)
;; Plugin dependencies
@@ -248,9 +250,9 @@
("libcddb" ,libcddb)
("libcdio-paranoia" ,libcdio-paranoia)
("libcue" ,libcue)
- ("libmodplug" ,libmodplug)
("libnotify" ,libnotify)
("libogg" ,libogg)
+ ("libopenmpt" ,libopenmpt)
("libsamplerate" ,libsamplerate)
("libsndfile" ,libsndfile)
("libvorbis" ,libvorbis)
--
2.30.2
N
N
Nicolas Goaziou wrote on 5 Aug 2021 09:00
(name . Felix Gruber)(address . felgru@posteo.net)(address . 49816@debbugs.gnu.org)
87eeb8fka6.fsf@nicolasgoaziou.fr
Hello,

Felix Gruber <felgru@posteo.net> writes:

Toggle quote (3 lines)
> * gnu/packages/music.scm (audacious): Update to 4.1.
> [inputs]: Add gtk+-2 and replace libmodplug with libopenmpt.

Thank you.

Why do you add gtk+-2 as an input? There's a more recent Qt UI. You
might want to consider adding audacious-gtk package instead.

WDYT?

Regards,
--
Nicolas Goaziou
F
F
Felix Gruber wrote on 5 Aug 2021 19:02
(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)(address . 49816@debbugs.gnu.org)
4f9ef888-6106-a20a-078f-93deb2bba296@posteo.net
Hello Nicolas,

On 8/5/21 9:00 AM, Nicolas Goaziou wrote:
Toggle quote (3 lines)
> Why do you add gtk+-2 as an input? There's a more recent Qt UI. You
> might want to consider adding audacious-gtk package instead.

I've added gtk+-2 as an input as otherwise the configure script failed
with the following error:

```
checking for GTK... no
configure: error: Package requirements (gtk+-2.0 >= 2.24) were not met:

No package 'gtk+-2.0' found

Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.

Alternatively, you may set the environment variables GTK_CFLAGS
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
```

I've thought that GTK+ had become a required dependency, but now that
you've asked, I've looked a bit closer and apparently one can still
disable it by passing `--disable-gtk` to the configure script.

I'll send an updated patch without gtk+-2 input.

Best regards,
Felix
F
F
Felix Gruber wrote on 5 Aug 2021 19:11
[PATCH v2] gnu: audacious: Update to 4.1.
(address . 49816@debbugs.gnu.org)
20210805171142.11271-1-felgru@posteo.net
* gnu/packages/music.scm (audacious): Update to 4.1.
[inputs]: Replace libmodplug with libopenmpt.
[arguments]: Add --disable-gtk configure flag as building against GTK,
in addition to QT, has otherwise become the default.
---
gnu/packages/music.scm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)

Toggle diff (57 lines)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 9c69204610..b95be813dc 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -40,6 +40,7 @@
;;; Copyright © 2021 Frank Pursel <frank.pursel@gmail.com>
;;; Copyright © 2021 Rovanion Luckey <rovanion.luckey@gmail.com>
;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li>
+;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -177,18 +178,19 @@
(define-public audacious
(package
(name "audacious")
- (version "4.0.5")
+ (version "4.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://distfiles.audacious-media-player.org/"
"audacious-" version ".tar.bz2"))
(sha256
- (base32 "028zjgz0p7ys15lk2a30m5zcv9xrx3ga50wjsh4m4zxilgkakbji"))))
+ (base32 "0p734psjjvjcmla2hg5h6a9v1prvy63jj9xm2g2ngs49jy7qan0z"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
- (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
+ (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")
+ "--disable-gtk")
#:tests? #f ; no check target
#:phases
(modify-phases %standard-phases
@@ -228,7 +230,7 @@
(uri (string-append "https://distfiles.audacious-media-player.org/"
"audacious-plugins-" version ".tar.bz2"))
(sha256
- (base32 "0ny5w1agr9jaz5w3wyyxf1ygmzmd1sivaf97lcm4z4w6529520lz"))))
+ (base32 "0k0xnqmxi5lna034i2cnzvfzrykxmv4fbs1nkrc9sd2ma1igrmns"))))
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for gdbus-codegen
("pkg-config" ,pkg-config)))
@@ -248,9 +250,9 @@
("libcddb" ,libcddb)
("libcdio-paranoia" ,libcdio-paranoia)
("libcue" ,libcue)
- ("libmodplug" ,libmodplug)
("libnotify" ,libnotify)
("libogg" ,libogg)
+ ("libopenmpt" ,libopenmpt)
("libsamplerate" ,libsamplerate)
("libsndfile" ,libsndfile)
("libvorbis" ,libvorbis)
--
2.30.2
N
N
Nicolas Goaziou wrote on 5 Aug 2021 22:09
(name . Felix Gruber)(address . felgru@posteo.net)(address . 49816-done@debbugs.gnu.org)
87pmurejrn.fsf@nicolasgoaziou.fr
Hello,

Felix Gruber <felgru@posteo.net> writes:

Toggle quote (5 lines)
> * gnu/packages/music.scm (audacious): Update to 4.1.
> [inputs]: Replace libmodplug with libopenmpt.
> [arguments]: Add --disable-gtk configure flag as building against GTK,
> in addition to QT, has otherwise become the default.

Applied. Thank you.

Regards,
--
Nicolas Goaziou
Closed
?