From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 24 Oct 2025 10:05:15 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vCCnT-00BFJ9-11 for lore@lore.pengutronix.de; Fri, 24 Oct 2025 10:05:15 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vCCnT-0005oz-5d; Fri, 24 Oct 2025 10:05:15 +0200 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vCCnG-0005og-QQ; Fri, 24 Oct 2025 10:05:02 +0200 From: =?UTF-8?q?Sven=20P=C3=BCschel?= To: ptxdist@pengutronix.de Date: Fri, 24 Oct 2025 10:04:32 +0200 Message-ID: <20251024080501.3278561-1-s.pueschel@pengutronix.de> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] libtag: version bump 1.13.1 -> 2.1.1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false 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 --- 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