[ptxdist] [PATCH] libtag: version bump 1.13.1 -> 2.1.1

[ptxdist] [PATCH] libtag: version bump 1.13.1 -> 2.1.1

[Sven Püschel]

TagLib v2.0 is binary incompatible to v1.x, requiring all applications
to be rebuilt against it.

Formats can now be disabled at build time [1]. Keep the default by
keeping all formats enabled.

The UTF8 options are vendored from utf8cpp. While this header only
library can be installed into the system, it is not supported by the
author [2] and it should be vendored. Therefore don't create a separate
rule for utf8cpp and let taglib use it's vendored version.

The bindings option has been disabled, as it doesn't seem to be
required by gst-plugins-good1.

As the MPL license was included in the license files, but not the
license, the tag.h file header was inspected. It states that it
can either be licensed under the LGPL or the MPL and all other files
seem to share this OR relation. Also it doesn't mention the
"or later" phrase for the LGPL, therefore change the license to
LGPL-2.1-only.

https://mail.kde.org/pipermail/taglib-devel/2024-January/003075.html
https://mail.kde.org/pipermail/taglib-devel/2024-March/003079.html
https://mail.kde.org/pipermail/taglib-devel/2024-August/003081.html
https://mail.kde.org/pipermail/taglib-devel/2025-May/003096.html
https://mail.kde.org/pipermail/taglib-devel/2025-June/003103.html

[1] https://github.com/taglib/taglib/commit/ee1931b81116cd0091c906896f6f4fb74850be51
[2] https://github.com/nemtrif/utfcpp/blob/961e7a3e9b3c44c3f09a651694415030a4019bc2/README.md?plain=1#L121

Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
 rules/libtag.make | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/rules/libtag.make b/rules/libtag.make
index 8d26a56da..a31802ee2 100644
--- a/rules/libtag.make
+++ b/rules/libtag.make
@@ -14,15 +14,16 @@ PACKAGES-$(PTXCONF_LIBTAG) += libtag
 #
 # Paths and names
 #
-LIBTAG_VERSION		:= 1.13.1
-LIBTAG_MD5		:= 2fe6089da73ad414aa1b982b83415362
+LIBTAG_VERSION		:= 2.1.1
+LIBTAG_MD5		:= 9feffe76b4643eb724185310879c3123
 LIBTAG			:= taglib-$(LIBTAG_VERSION)
 LIBTAG_SUFFIX		:= tar.gz
 LIBTAG_URL		:= https://taglib.org/releases/$(LIBTAG).$(LIBTAG_SUFFIX)
 LIBTAG_SOURCE		:= $(SRCDIR)/$(LIBTAG).$(LIBTAG_SUFFIX)
 LIBTAG_DIR		:= $(BUILDDIR)/$(LIBTAG)
-LIBTAG_LICENSE		:= LGPL-2.1-or-later
+LIBTAG_LICENSE		:= LGPL-2.1-only OR MPL-1.1
 LIBTAG_LICENSE_FILES	:= \
+	file://taglib/tag.h;startline=6;endline=24;md5=2e05d2813b45b33c4853a90dd4c161ed \
 	file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
 	file://COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325
 
@@ -33,9 +34,23 @@ LIBTAG_LICENSE_FILES	:= \
 LIBTAG_CONF_TOOL	:= cmake
 LIBTAG_CONF_OPT		:= \
 	$(CROSS_CMAKE_USR) \
+	-DBUILD_BINDINGS=OFF \
+	-DBUILD_EXAMPLES=OFF \
 	-DBUILD_SHARED_LIBS=ON \
 	-DBUILD_TESTING=OFF \
-	-DBUILD_EXAMPLES=OFF \
+	-DTRACE_IN_RELEASE=OFF \
+	-DUTF8_INSTALL=OFF \
+	-DUTF8_SAMPLES=OFF \
+	-DUTF8_TESTS=OFF \
+	-DWITH_APE=ON \
+	-DWITH_ASF=ON \
+	-DWITH_DSF=ON \
+	-DWITH_MOD=ON \
+	-DWITH_MP4=ON \
+	-DWITH_RIFF=ON \
+	-DWITH_SHORTEN=ON \
+	-DWITH_TRUEAUDIO=ON \
+	-DWITH_VORBIS=ON \
 	-DWITH_ZLIB=$(call ptx/onoff, PTXCONF_LIBTAG_ZLIB)
 
 # ----------------------------------------------------------------------------
-- 
2.47.3

Re: [ptxdist] [APPLIED] libtag: version bump 1.13.1 -> 2.1.1

[Michael Olbrich]

Thanks, applied as 4635ddd2a178706cb8d0e38b38f49f618bb49482.

Michael

[sent from post-receive hook]

On Sun, 26 Oct 2025 21:32:53 +0100, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> TagLib v2.0 is binary incompatible to v1.x, requiring all applications
> to be rebuilt against it.
> 
> Formats can now be disabled at build time [1]. Keep the default by
> keeping all formats enabled.
> 
> The UTF8 options are vendored from utf8cpp. While this header only
> library can be installed into the system, it is not supported by the
> author [2] and it should be vendored. Therefore don't create a separate
> rule for utf8cpp and let taglib use it's vendored version.
> 
> The bindings option has been disabled, as it doesn't seem to be
> required by gst-plugins-good1.
> 
> As the MPL license was included in the license files, but not the
> license, the tag.h file header was inspected. It states that it
> can either be licensed under the LGPL or the MPL and all other files
> seem to share this OR relation. Also it doesn't mention the
> "or later" phrase for the LGPL, therefore change the license to
> LGPL-2.1-only.
> 
> https://mail.kde.org/pipermail/taglib-devel/2024-January/003075.html
> https://mail.kde.org/pipermail/taglib-devel/2024-March/003079.html
> https://mail.kde.org/pipermail/taglib-devel/2024-August/003081.html
> https://mail.kde.org/pipermail/taglib-devel/2025-May/003096.html
> https://mail.kde.org/pipermail/taglib-devel/2025-June/003103.html
> 
> [1] https://github.com/taglib/taglib/commit/ee1931b81116cd0091c906896f6f4fb74850be51
> [2] https://github.com/nemtrif/utfcpp/blob/961e7a3e9b3c44c3f09a651694415030a4019bc2/README.md?plain=1#L121
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20251024080501.3278561-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libtag.make b/rules/libtag.make
> index 8d26a56daabd..a31802ee291c 100644
> --- a/rules/libtag.make
> +++ b/rules/libtag.make
> @@ -14,15 +14,16 @@ PACKAGES-$(PTXCONF_LIBTAG) += libtag
>  #
>  # Paths and names
>  #
> -LIBTAG_VERSION		:= 1.13.1
> -LIBTAG_MD5		:= 2fe6089da73ad414aa1b982b83415362
> +LIBTAG_VERSION		:= 2.1.1
> +LIBTAG_MD5		:= 9feffe76b4643eb724185310879c3123
>  LIBTAG			:= taglib-$(LIBTAG_VERSION)
>  LIBTAG_SUFFIX		:= tar.gz
>  LIBTAG_URL		:= https://taglib.org/releases/$(LIBTAG).$(LIBTAG_SUFFIX)
>  LIBTAG_SOURCE		:= $(SRCDIR)/$(LIBTAG).$(LIBTAG_SUFFIX)
>  LIBTAG_DIR		:= $(BUILDDIR)/$(LIBTAG)
> -LIBTAG_LICENSE		:= LGPL-2.1-or-later
> +LIBTAG_LICENSE		:= LGPL-2.1-only OR MPL-1.1
>  LIBTAG_LICENSE_FILES	:= \
> +	file://taglib/tag.h;startline=6;endline=24;md5=2e05d2813b45b33c4853a90dd4c161ed \
>  	file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
>  	file://COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325
>  
> @@ -33,9 +34,23 @@ LIBTAG_LICENSE_FILES	:= \
>  LIBTAG_CONF_TOOL	:= cmake
>  LIBTAG_CONF_OPT		:= \
>  	$(CROSS_CMAKE_USR) \
> +	-DBUILD_BINDINGS=OFF \
> +	-DBUILD_EXAMPLES=OFF \
>  	-DBUILD_SHARED_LIBS=ON \
>  	-DBUILD_TESTING=OFF \
> -	-DBUILD_EXAMPLES=OFF \
> +	-DTRACE_IN_RELEASE=OFF \
> +	-DUTF8_INSTALL=OFF \
> +	-DUTF8_SAMPLES=OFF \
> +	-DUTF8_TESTS=OFF \
> +	-DWITH_APE=ON \
> +	-DWITH_ASF=ON \
> +	-DWITH_DSF=ON \
> +	-DWITH_MOD=ON \
> +	-DWITH_MP4=ON \
> +	-DWITH_RIFF=ON \
> +	-DWITH_SHORTEN=ON \
> +	-DWITH_TRUEAUDIO=ON \
> +	-DWITH_VORBIS=ON \
>  	-DWITH_ZLIB=$(call ptx/onoff, PTXCONF_LIBTAG_ZLIB)
>  
>  # ----------------------------------------------------------------------------