From 96e79bdbfbd18ae61f147258f5c92b1d0d2905a2 Mon Sep 17 00:00:00 2001
From: arkhan <arkhan@riseup.net>
Date: Wed, 16 Jul 2025 22:48:06 -0500
Subject: [PATCH] =?UTF-8?q?=EF=BB=BFgnu:=20taglib:=20Update=20to=202.1.1.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mp3.scm (taglib): Update to 2.1.1.
[source]: Use git commit v2.1.1.
[arguments]: Remove adjust-zlib-ldflags phases — no longer needed as upstream CMake now finds
utfcpp and zlib automatically.
[inputs]: Add cppunit, utfcpp input.

Change-Id: I885ae09ceace3b88c131b429a27aea7ab57223e9
Signed-off-by: Gabriel Wicki <gabriel@erlikon.ch>
---
 gnu/packages/mp3.scm | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index d2b97372d10..eaf159ac4d5 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -60,6 +60,7 @@
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages textutils)           ;utfcpp
   #:use-module (gnu packages linux)               ;alsa-lib
   #:use-module (gnu packages video)               ;ffmpeg
   #:use-module (guix packages)
@@ -244,7 +245,7 @@ a highly stable and efficient implementation.")
 (define-public taglib
   (package
     (name "taglib")
-    (version "1.12")
+    (version "2.1.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -253,23 +254,12 @@ a highly stable and efficient implementation.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0q7dkn5rh9v6b0scmcp2qmjv3iransafmpn6jvgid0yq75m2nqd2"))))
+                "0m1xyjsg6a8p4prn1xr1g29zsxqr7606cv3cblgjgxkb1dk26fx7"))))
     (build-system cmake-build-system)
     (arguments
-      '(#:tests? #f ; Tests are not ran with BUILD_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 (list zlib))
+     (list
+      #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON")))
+    (inputs (list cppunit utfcpp zlib))
     (home-page "https://taglib.org")
     (synopsis "Library to access audio file meta-data")
     (description