diff options
Diffstat (limited to 'gnu/packages/mp3.scm')
| -rw-r--r-- | gnu/packages/mp3.scm | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 92e3d5d5f8..fdc8ba801f 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -1,10 +1,10 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014, 2015, 2017, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> -;;; Copyright © 2017, 2019 Pierre Langlois <pierre.langlois@gmx.com> +;;; Copyright © 2017, 2019, 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> @@ -50,6 +50,7 @@ #:use-module (gnu packages video) ;ffmpeg #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system python) @@ -160,18 +161,31 @@ a highly stable and efficient implementation.") (define-public taglib (package (name "taglib") - (version "1.11.1") + (version "1.12-beta-1") (source (origin - (method url-fetch) - (uri (string-append "http://taglib.github.io/releases/taglib-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/taglib/taglib") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn")))) + "1mp6w2ikniw8w6d5wr0h20j0ijg8jw7s9dli5a8k9znpznvxpym4")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; Tests are not ran with BUILD_SHARED_LIBS on. - #:configure-flags (list "-DBUILD_SHARED_LIBS=ON"))) + #:configure-flags (list "-DBUILD_SHARED_LIBS=ON") + #:phases (modify-phases %standard-phases + (add-before 'configure 'adjust-zlib-ldflags + (lambda* (#:key inputs #:allow-other-keys) + ;; Make sure users of 'taglib-config --libs' get the -L + ;; flag for zlib. + (substitute* "CMakeLists.txt" + (("set\\(ZLIB_LIBRARIES_FLAGS -lz\\)") + (string-append "set(ZLIB_LIBRARIES_FLAGS \"-L" + (assoc-ref inputs "zlib") + "/lib -lz\")"))) + #t))))) (inputs `(("zlib" ,zlib))) (home-page "https://taglib.org") (synopsis "Library to access audio file meta-data") |