diff mbox series

[v2,1/2] package/libid3tag: bump version to 0.16.3

Message ID 20251005080323.2103951-1-bernd@kuhls.net
State New
Headers show
Series [v2,1/2] package/libid3tag: bump version to 0.16.3 | expand

Commit Message

Bernd Kuhls Oct. 5, 2025, 8:03 a.m. UTC 
Switched to maintained fork also used by Debian:
https://codeberg.org/tenacityteam/libid3tag/commit/7dce7b492406becd08c2691bf949e086b127fb58
https://tracker.debian.org/news/1573712/accepted-libid3tag-0163-1-source-into-unstable/

Removed Debian patchset which is included in this release and contains
fixes for CVEs mentioned in LIBID3TAG_IGNORE_CVES:

- 10_utf16.dpatch
  https://codeberg.org/tenacityteam/libid3tag/commit/2a0f4df1544e3e124622e2e87a117395d40a1d57

- 11_unknown_encoding.patch
  https://codeberg.org/tenacityteam/libid3tag/commit/68777efc16d05aa5bb25fa50ff796c2e23e42054

Switched build system to CMake:
https://codeberg.org/tenacityteam/libid3tag/commit/cb746b9f216d3016825715df473bfa8807e007f5
due to autoconf removal:
https://codeberg.org/tenacityteam/libid3tag/commit/2ceebdf3b82f149125b679b0002348426f51dc43
and added upstream commit to fix build with CMake 4.x.

Also removed the host-gperf dependency which was needed by autoreconf,
see buildroot commit 7ecd0e4edf9f42795ef70097a8f205b2aaa67a6d for
details.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
v2: added upstream commit to fix build with CMake 4.x

 .../0001-Allow-build-with-CMake-4.0.0.patch   | 26 +++++++++++++++++
 package/libid3tag/Config.in                   |  2 +-
 package/libid3tag/libid3tag.hash              |  7 ++---
 package/libid3tag/libid3tag.mk                | 29 ++++---------------
 4 files changed, 34 insertions(+), 30 deletions(-)
 create mode 100644 package/libid3tag/0001-Allow-build-with-CMake-4.0.0.patch
diff mbox series

Patch

diff --git a/package/libid3tag/0001-Allow-build-with-CMake-4.0.0.patch b/package/libid3tag/0001-Allow-build-with-CMake-4.0.0.patch
new file mode 100644
index 0000000000..cd14130252
--- /dev/null
+++ b/package/libid3tag/0001-Allow-build-with-CMake-4.0.0.patch
@@ -0,0 +1,26 @@ 
+From eee94b22508a066f7b9bc1ae05d2d85982e73959 Mon Sep 17 00:00:00 2001
+From: heitbaum <heitbaum@noreply.codeberg.org>
+Date: Thu, 1 May 2025 05:34:30 +0000
+Subject: [PATCH] Allow build with CMake 4.0.0
+
+CMake 4.0.0 deprecates CMake syntax < 3.10. Update to using a minimum of 3.10.
+
+ref: https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html
+
+Upstream: https://codeberg.org/tenacityteam/libid3tag/commit/eee94b22508a066f7b9bc1ae05d2d85982e73959
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d181300..083b5f1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1.0)
++cmake_minimum_required(VERSION 3.10)
+ project(id3tag VERSION 0.16.3)
+ 
+ option(BUILD_SHARED_LIBS "Build dynamic library" ON)
diff --git a/package/libid3tag/Config.in b/package/libid3tag/Config.in
index 869b9f7f6c..b07ac891e1 100644
--- a/package/libid3tag/Config.in
+++ b/package/libid3tag/Config.in
@@ -4,4 +4,4 @@  config BR2_PACKAGE_LIBID3TAG
 	help
 	  ID3 tag reading library from the MAD project.
 
-	  http://www.underbit.com/products/mad/
+	  https://codeberg.org/tenacityteam/libid3tag
diff --git a/package/libid3tag/libid3tag.hash b/package/libid3tag/libid3tag.hash
index 9aa1d00270..5b800f3e73 100644
--- a/package/libid3tag/libid3tag.hash
+++ b/package/libid3tag/libid3tag.hash
@@ -1,7 +1,4 @@ 
-# From http://snapshot.debian.org/archive/debian/20190310T213528Z/pool/main/libi/libid3tag/libid3tag_0.15.1b-14.dsc
-sha256  63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151  libid3tag_0.15.1b.orig.tar.gz
-sha256  f174cafe02bef25a9ad8cb7f9ce80119147297a7036f50878e85ac0d7ae09c62  libid3tag_0.15.1b-14.debian.tar.xz
-
-# Hash for license files:
+# Locally computed
+sha256  0561009778513a95d91dac33cee8418d6622f710450a7cb56a74636d53b588cb  0.16.3.tar.gz
 sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
 sha256  7f12ad28dc075763e91b91bfa60fad04062380011ddad8f6bac21dd7b1f44367  COPYRIGHT
diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk
index 5d7b219bb1..6cee42eeb9 100644
--- a/package/libid3tag/libid3tag.mk
+++ b/package/libid3tag/libid3tag.mk
@@ -4,31 +4,12 @@ 
 #
 ################################################################################
 
-LIBID3TAG_VERSION = 0.15.1b
-LIBID3TAG_PATCH = libid3tag_$(LIBID3TAG_VERSION)-14.debian.tar.xz
-LIBID3TAG_SOURCE = libid3tag_$(LIBID3TAG_VERSION).orig.tar.gz
-LIBID3TAG_SITE = \
-	http://snapshot.debian.org/archive/debian/20190310T213528Z/pool/main/libi/libid3tag
+LIBID3TAG_VERSION = 0.16.3
+LIBID3TAG_SOURCE = $(LIBID3TAG_VERSION).tar.gz
+LIBID3TAG_SITE = https://codeberg.org/tenacityteam/libid3tag/archive
 LIBID3TAG_LICENSE = GPL-2.0+
 LIBID3TAG_LICENSE_FILES = COPYING COPYRIGHT
 LIBID3TAG_INSTALL_STAGING = YES
-LIBID3TAG_DEPENDENCIES = host-gperf zlib
+LIBID3TAG_DEPENDENCIES = zlib
 
-# debian/patches/10_utf16.dpatch
-LIBID3TAG_IGNORE_CVES += CVE-2004-2779 CVE-2017-11551
-
-# debian/patches/11_unknown_encoding.dpatch
-LIBID3TAG_IGNORE_CVES += CVE-2017-11550
-
-# Force autoreconf to be able to use a more recent libtool script, that
-# is able to properly behave in the face of a missing C++ compiler.
-LIBID3TAG_AUTORECONF = YES
-
-define LIBID3TAG_INSTALL_STAGING_PC
-	$(INSTALL) -D package/libid3tag/id3tag.pc \
-		$(STAGING_DIR)/usr/lib/pkgconfig/id3tag.pc
-endef
-
-LIBID3TAG_POST_INSTALL_STAGING_HOOKS += LIBID3TAG_INSTALL_STAGING_PC
-
-$(eval $(autotools-package))
+$(eval $(cmake-package))