* [PR PATCH] [WIP] taglib: update to 2.0.2
@ 2025-02-25 21:48 slymattz
2025-02-25 22:41 ` [PR PATCH] [Updated] " slymattz
` (95 more replies)
0 siblings, 96 replies; 97+ messages in thread
From: slymattz @ 2025-02-25 21:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1194 bytes --]
There is a new pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 31754 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/26] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/26] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/26] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/26] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/26] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/26] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/26] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/26] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/26] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/26] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/26] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/26] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/26] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/26] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/26] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/26] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/26] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/26] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/26] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/26] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/26] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/26] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/26] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/26] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/26] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/26] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
@ 2025-02-25 22:41 ` slymattz
2025-02-25 22:53 ` slymattz
` (94 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-25 22:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 32852 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/27] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/27] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/27] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/27] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/27] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/27] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/27] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/27] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/27] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/27] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/27] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/27] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/27] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/27] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/27] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/27] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/27] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/27] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/27] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/27] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/27] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/27] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/27] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/27] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/27] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/27] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/27] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
2025-02-25 22:41 ` [PR PATCH] [Updated] " slymattz
@ 2025-02-25 22:53 ` slymattz
2025-02-25 22:59 ` slymattz
` (93 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-25 22:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 35537 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/28] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/28] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/28] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/28] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/28] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/28] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/28] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/28] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/28] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/28] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/28] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/28] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/28] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/28] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/28] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/28] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/28] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/28] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/28] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/28] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/28] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/28] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/28] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/28] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/28] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/28] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/28] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/28] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
2025-02-25 22:41 ` [PR PATCH] [Updated] " slymattz
2025-02-25 22:53 ` slymattz
@ 2025-02-25 22:59 ` slymattz
2025-02-25 23:02 ` slymattz
` (92 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-25 22:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 36968 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/29] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/29] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/29] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/29] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/29] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/29] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/29] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/29] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/29] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/29] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/29] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/29] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/29] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/29] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/29] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/29] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/29] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/29] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/29] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/29] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/29] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/29] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/29] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/29] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/29] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/29] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/29] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/29] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/29] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (2 preceding siblings ...)
2025-02-25 22:59 ` slymattz
@ 2025-02-25 23:02 ` slymattz
2025-02-26 12:00 ` slymattz
` (91 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-25 23:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 37620 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/30] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/30] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/30] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/30] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/30] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/30] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/30] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/30] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/30] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/30] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/30] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/30] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/30] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/30] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/30] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/30] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/30] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/30] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/30] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/30] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/30] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/30] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/30] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/30] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/30] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/30] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/30] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/30] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/30] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/30] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (3 preceding siblings ...)
2025-02-25 23:02 ` slymattz
@ 2025-02-26 12:00 ` slymattz
2025-02-26 12:31 ` slymattz
` (90 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 12:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 40272 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/31] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/31] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/31] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/31] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/31] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/31] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/31] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/31] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/31] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/31] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/31] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/31] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/31] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/31] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/31] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/31] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/31] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/31] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/31] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/31] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/31] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/31] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/31] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/31] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/31] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/31] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/31] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/31] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/31] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/31] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/31] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (4 preceding siblings ...)
2025-02-26 12:00 ` slymattz
@ 2025-02-26 12:31 ` slymattz
2025-02-26 12:40 ` slymattz
` (89 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 12:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 42647 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/32] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/32] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/32] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/32] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/32] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/32] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/32] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/32] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/32] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/32] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/32] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/32] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/32] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/32] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/32] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/32] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/32] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/32] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/32] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/32] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/32] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/32] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/32] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/32] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/32] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/32] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/32] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/32] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/32] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/32] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/32] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/32] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (5 preceding siblings ...)
2025-02-26 12:31 ` slymattz
@ 2025-02-26 12:40 ` slymattz
2025-02-26 12:48 ` slymattz
` (88 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 12:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 44388 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/33] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/33] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/33] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/33] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/33] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/33] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/33] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/33] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/33] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/33] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/33] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/33] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/33] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/33] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/33] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/33] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/33] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/33] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/33] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/33] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/33] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/33] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/33] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/33] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/33] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/33] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/33] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/33] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/33] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/33] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/33] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/33] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 4173767073e1e9f2638afe3af98103770ed8a2db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/33] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (6 preceding siblings ...)
2025-02-26 12:40 ` slymattz
@ 2025-02-26 12:48 ` slymattz
2025-02-26 12:50 ` slymattz
` (87 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 12:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 45126 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/34] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/34] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/34] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/34] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/34] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/34] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/34] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/34] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/34] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/34] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/34] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/34] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/34] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/34] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/34] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/34] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/34] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/34] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/34] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/34] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/34] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/34] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/34] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/34] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/34] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/34] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/34] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/34] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/34] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/34] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/34] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/34] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 4173767073e1e9f2638afe3af98103770ed8a2db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/34] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 04d7df0d530819e87daa3fc0879934fdb14d765b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/34] tellico: revbump for libtag
---
srcpkgs/tellico/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..4947cae7633638 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (7 preceding siblings ...)
2025-02-26 12:48 ` slymattz
@ 2025-02-26 12:50 ` slymattz
2025-02-26 13:01 ` slymattz
` (86 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 12:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 45799 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/35] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/35] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/35] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/35] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/35] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/35] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/35] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/35] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/35] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/35] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/35] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/35] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/35] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/35] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/35] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/35] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/35] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/35] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/35] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/35] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/35] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/35] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/35] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/35] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/35] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/35] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/35] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/35] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/35] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/35] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/35] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/35] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 4173767073e1e9f2638afe3af98103770ed8a2db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/35] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 04d7df0d530819e87daa3fc0879934fdb14d765b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/35] tellico: revbump for libtag
---
srcpkgs/tellico/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..4947cae7633638 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
From 5cb6948fcb668353175440061e44e76baa0d3b53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/35] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (8 preceding siblings ...)
2025-02-26 12:50 ` slymattz
@ 2025-02-26 13:01 ` slymattz
2025-02-26 13:08 ` slymattz
` (85 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 13:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 46800 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/36] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/36] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/36] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/36] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/36] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/36] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/36] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/36] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/36] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/36] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/36] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/36] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/36] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/36] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/36] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/36] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/36] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/36] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/36] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/36] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/36] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/36] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/36] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/36] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/36] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/36] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/36] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/36] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/36] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/36] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/36] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/36] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 4173767073e1e9f2638afe3af98103770ed8a2db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/36] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 04d7df0d530819e87daa3fc0879934fdb14d765b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/36] tellico: revbump for libtag
---
srcpkgs/tellico/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..4947cae7633638 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
From 5cb6948fcb668353175440061e44e76baa0d3b53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/36] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 5dbe364b54c01c17667abde90fec75a6e9aab3cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/36] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (9 preceding siblings ...)
2025-02-26 13:01 ` slymattz
@ 2025-02-26 13:08 ` slymattz
2025-02-26 13:12 ` slymattz
` (84 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 13:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 49047 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/37] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/37] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/37] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/37] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/37] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/37] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/37] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/37] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/37] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/37] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/37] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/37] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/37] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/37] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/37] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/37] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/37] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/37] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/37] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/37] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/37] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/37] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/37] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/37] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/37] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/37] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/37] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/37] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/37] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/37] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/37] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/37] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 4173767073e1e9f2638afe3af98103770ed8a2db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/37] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 04d7df0d530819e87daa3fc0879934fdb14d765b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/37] tellico: revbump for libtag
---
srcpkgs/tellico/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..4947cae7633638 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
From 5cb6948fcb668353175440061e44e76baa0d3b53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/37] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 5dbe364b54c01c17667abde90fec75a6e9aab3cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/37] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
From a65e1072e259dddfc4ea324efc4497d9d78a391d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/37] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (10 preceding siblings ...)
2025-02-26 13:08 ` slymattz
@ 2025-02-26 13:12 ` slymattz
2025-02-26 13:23 ` slymattz
` (83 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 13:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 51997 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/38] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/38] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/38] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/38] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/38] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/38] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/38] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/38] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/38] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/38] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/38] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/38] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/38] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/38] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/38] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/38] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/38] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/38] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/38] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/38] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/38] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/38] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/38] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/38] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/38] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/38] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/38] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/38] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/38] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/38] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/38] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/38] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 4173767073e1e9f2638afe3af98103770ed8a2db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/38] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 04d7df0d530819e87daa3fc0879934fdb14d765b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/38] tellico: revbump for libtag
---
srcpkgs/tellico/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..4947cae7633638 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
From 5cb6948fcb668353175440061e44e76baa0d3b53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/38] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 5dbe364b54c01c17667abde90fec75a6e9aab3cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/38] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
From a65e1072e259dddfc4ea324efc4497d9d78a391d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/38] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
From cb0e1e60725d9195a2130568bc4b00ff37a8fb68 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/38] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (11 preceding siblings ...)
2025-02-26 13:12 ` slymattz
@ 2025-02-26 13:23 ` slymattz
2025-02-26 13:28 ` slymattz
` (82 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 13:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 53192 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/39] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/39] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/39] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/39] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/39] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/39] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/39] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/39] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/39] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/39] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/39] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/39] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/39] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/39] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/39] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/39] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/39] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/39] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/39] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/39] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/39] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/39] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/39] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/39] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/39] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/39] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/39] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/39] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/39] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/39] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/39] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/39] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 4173767073e1e9f2638afe3af98103770ed8a2db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/39] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 04d7df0d530819e87daa3fc0879934fdb14d765b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/39] tellico: revbump for libtag
---
srcpkgs/tellico/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..4947cae7633638 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
From 5cb6948fcb668353175440061e44e76baa0d3b53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/39] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 5dbe364b54c01c17667abde90fec75a6e9aab3cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/39] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
From a65e1072e259dddfc4ea324efc4497d9d78a391d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/39] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
From cb0e1e60725d9195a2130568bc4b00ff37a8fb68 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/39] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
From d6c092ebbe484483c056b285484b776be2f8f396 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/39] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (12 preceding siblings ...)
2025-02-26 13:23 ` slymattz
@ 2025-02-26 13:28 ` slymattz
2025-02-26 13:54 ` slymattz
` (81 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 13:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 54477 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/40] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/40] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/40] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/40] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/40] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/40] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/40] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/40] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/40] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/40] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/40] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/40] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/40] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/40] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/40] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/40] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/40] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/40] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/40] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/40] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/40] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/40] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/40] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/40] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/40] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/40] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/40] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/40] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/40] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/40] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/40] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/40] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 4173767073e1e9f2638afe3af98103770ed8a2db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/40] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 04d7df0d530819e87daa3fc0879934fdb14d765b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/40] tellico: revbump for libtag
---
srcpkgs/tellico/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..4947cae7633638 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
From 5cb6948fcb668353175440061e44e76baa0d3b53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/40] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 5dbe364b54c01c17667abde90fec75a6e9aab3cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/40] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
From a65e1072e259dddfc4ea324efc4497d9d78a391d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/40] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
From cb0e1e60725d9195a2130568bc4b00ff37a8fb68 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/40] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
From d6c092ebbe484483c056b285484b776be2f8f396 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/40] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From 8663ba3b98819e8122e715edbbfca82b6b2eeeb9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/40] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (13 preceding siblings ...)
2025-02-26 13:28 ` slymattz
@ 2025-02-26 13:54 ` slymattz
2025-02-26 13:57 ` slymattz
` (80 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 13:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 55870 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/41] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/41] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 4173767073e1e9f2638afe3af98103770ed8a2db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 04d7df0d530819e87daa3fc0879934fdb14d765b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..4947cae7633638 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
From 5cb6948fcb668353175440061e44e76baa0d3b53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 5dbe364b54c01c17667abde90fec75a6e9aab3cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
From a65e1072e259dddfc4ea324efc4497d9d78a391d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
From cb0e1e60725d9195a2130568bc4b00ff37a8fb68 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
From d6c092ebbe484483c056b285484b776be2f8f396 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/41] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From 8663ba3b98819e8122e715edbbfca82b6b2eeeb9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 2781b463b05f0d48e003e3f51e1227da148a8b94 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 41/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/soundkonverter/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (14 preceding siblings ...)
2025-02-26 13:54 ` slymattz
@ 2025-02-26 13:57 ` slymattz
2025-02-26 14:06 ` slymattz
` (79 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 13:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 57883 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/42] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/42] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/42] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/42] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/42] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/42] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/42] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/42] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/42] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/42] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/42] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/42] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/42] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/42] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/42] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/42] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/42] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/42] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/42] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/42] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/42] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/42] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/42] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/42] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/42] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/42] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/42] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/42] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/42] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/42] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/42] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/42] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 4173767073e1e9f2638afe3af98103770ed8a2db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/42] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 04d7df0d530819e87daa3fc0879934fdb14d765b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/42] tellico: revbump for libtag
---
srcpkgs/tellico/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..4947cae7633638 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
From 5cb6948fcb668353175440061e44e76baa0d3b53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/42] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 5dbe364b54c01c17667abde90fec75a6e9aab3cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/42] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
From a65e1072e259dddfc4ea324efc4497d9d78a391d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/42] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
From cb0e1e60725d9195a2130568bc4b00ff37a8fb68 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/42] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
From d6c092ebbe484483c056b285484b776be2f8f396 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/42] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From 8663ba3b98819e8122e715edbbfca82b6b2eeeb9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/42] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 2781b463b05f0d48e003e3f51e1227da148a8b94 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 41/42] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/soundkonverter/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From d2acc0221a7f6395aa0506fb328ec58a9d360937 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:57:29 +0100
Subject: [PATCH 42/42] taglib-extras: remove package
obsolete with taglib2
---
common/shlibs | 1 -
srcpkgs/taglib-extras/template | 31 -------------------------------
2 files changed, 32 deletions(-)
delete mode 100644 srcpkgs/taglib-extras/template
diff --git a/common/shlibs b/common/shlibs
index 5ed9fccfa2c644..08958647414d4d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -416,7 +416,6 @@ libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
libtag.so.2 taglib-2.0.2_1
-libtag-extras.so.1 taglib-extras-1.0.1_1
libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
deleted file mode 100644
index 4157777e18a4c6..00000000000000
--- a/srcpkgs/taglib-extras/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'taglib-extras'
-pkgname=taglib-extras
-version=1.0.1
-revision=2
-build_style=cmake
-configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
-hostmakedepends="pkg-config taglib-devel"
-makedepends="zlib-devel taglib-devel"
-short_desc="Additional taglib plugins for KDE"
-maintainer="LockeAnarchist <emanuel@openmailbox.org>"
-homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
-checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
-
-pre_configure() {
- # Patch to look for taglib-1.11
- sed -i CMakeLists.txt -e 's;"1\.6";"1.11";'
-}
-
-taglib-extras-devel_package() {
- depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/bin
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- }
-}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (15 preceding siblings ...)
2025-02-26 13:57 ` slymattz
@ 2025-02-26 14:06 ` slymattz
2025-02-26 14:09 ` slymattz
` (78 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 14:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1029 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 55870 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/41] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/41] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 4173767073e1e9f2638afe3af98103770ed8a2db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 04d7df0d530819e87daa3fc0879934fdb14d765b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..4947cae7633638 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
From 5cb6948fcb668353175440061e44e76baa0d3b53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 5dbe364b54c01c17667abde90fec75a6e9aab3cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
From a65e1072e259dddfc4ea324efc4497d9d78a391d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
From cb0e1e60725d9195a2130568bc4b00ff37a8fb68 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
From d6c092ebbe484483c056b285484b776be2f8f396 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/41] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From 8663ba3b98819e8122e715edbbfca82b6b2eeeb9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 2781b463b05f0d48e003e3f51e1227da148a8b94 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 41/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/soundkonverter/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (16 preceding siblings ...)
2025-02-26 14:06 ` slymattz
@ 2025-02-26 14:09 ` slymattz
2025-02-26 14:21 ` slymattz
` (77 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 14:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1029 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 71309 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/42] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/42] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/42] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/42] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/42] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/42] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/42] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/42] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/42] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/42] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/42] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/42] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/42] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/42] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/42] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/42] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/42] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/42] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/42] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/42] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/42] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/42] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/42] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/42] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/42] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/42] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/42] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/42] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/42] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/42] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/42] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/42] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 4173767073e1e9f2638afe3af98103770ed8a2db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/42] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 04d7df0d530819e87daa3fc0879934fdb14d765b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/42] tellico: revbump for libtag
---
srcpkgs/tellico/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..4947cae7633638 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
From 5cb6948fcb668353175440061e44e76baa0d3b53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/42] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 5dbe364b54c01c17667abde90fec75a6e9aab3cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/42] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
From a65e1072e259dddfc4ea324efc4497d9d78a391d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/42] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
From cb0e1e60725d9195a2130568bc4b00ff37a8fb68 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/42] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
From d6c092ebbe484483c056b285484b776be2f8f396 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/42] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From 8663ba3b98819e8122e715edbbfca82b6b2eeeb9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/42] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 2781b463b05f0d48e003e3f51e1227da148a8b94 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 41/42] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/soundkonverter/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From fc4523f59469803a06d0450afeb06831fe5a62e1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 42/42] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 2 +-
2 files changed, 320 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..fe114d665080b8 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,7 +1,7 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (17 preceding siblings ...)
2025-02-26 14:09 ` slymattz
@ 2025-02-26 14:21 ` slymattz
2025-02-26 15:26 ` slymattz
` (76 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 14:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1029 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 71945 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/42] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/42] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/42] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/42] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/42] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/42] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/42] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/42] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/42] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/42] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/42] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/42] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/42] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/42] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/42] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/42] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/42] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/42] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/42] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/42] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/42] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/42] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/42] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/42] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/42] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/42] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/42] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/42] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/42] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/42] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/42] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/42] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 4173767073e1e9f2638afe3af98103770ed8a2db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/42] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 04d7df0d530819e87daa3fc0879934fdb14d765b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/42] tellico: revbump for libtag
---
srcpkgs/tellico/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..4947cae7633638 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
From 5cb6948fcb668353175440061e44e76baa0d3b53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/42] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 5dbe364b54c01c17667abde90fec75a6e9aab3cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/42] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
From a65e1072e259dddfc4ea324efc4497d9d78a391d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/42] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
From cb0e1e60725d9195a2130568bc4b00ff37a8fb68 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/42] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
From d6c092ebbe484483c056b285484b776be2f8f396 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/42] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From 8663ba3b98819e8122e715edbbfca82b6b2eeeb9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/42] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 2781b463b05f0d48e003e3f51e1227da148a8b94 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 41/42] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/soundkonverter/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 1ffff5a4d888459689297442e080faa3f1a8f7a0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 42/42] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (18 preceding siblings ...)
2025-02-26 14:21 ` slymattz
@ 2025-02-26 15:26 ` slymattz
2025-02-26 15:29 ` slymattz
` (75 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 15:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1029 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 72363 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/42] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/42] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/42] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/42] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/42] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/42] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/42] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/42] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/42] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/42] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/42] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/42] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/42] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/42] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/42] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/42] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/42] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/42] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/42] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/42] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/42] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/42] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/42] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/42] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/42] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/42] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/42] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/42] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/42] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/42] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/42] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/42] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 4173767073e1e9f2638afe3af98103770ed8a2db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/42] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 152ad56269079d4eff0563c7a7df57c51eed901a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/42] tellico: revbump for libtag
---
srcpkgs/tellico/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..048f8c6ded4acd 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,11 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+# two tests fail on GH workflows
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From 15dc5f648883ef3730f22d93f2aa7ede7f4a1bbd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/42] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 71f08191e47cd92928bf8be0ccd5c39cbfe398b1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/42] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
From 0ab0c00d4c0cd2193ffbc0886cff4d808b79b63a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/42] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
From 7b6c1b49b508fac7704ebd962c6bd54302fe777d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/42] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
From d4888f24fd05564c262872bb37e7fc3ac44ac3eb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/42] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From 483d9491a6f3399bb970a2c701833cb72175e163 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/42] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 72033dc1277ae408b258d1d7038a60286593eb5e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 41/42] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/soundkonverter/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 3333d7de8d4daa1fcee5d062924e02ce07a97752 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 42/42] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (19 preceding siblings ...)
2025-02-26 15:26 ` slymattz
@ 2025-02-26 15:29 ` slymattz
2025-02-26 20:54 ` slymattz
` (74 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 15:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1029 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 72425 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/42] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/42] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/42] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/42] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/42] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/42] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/42] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/42] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/42] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/42] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 70fe15291c8410db9f517656633f84cd1c7ed793 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/42] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 2 +-
2 files changed, 176 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..82ffa4944efb78 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
From bee03755a8ed60c3ca828175f5aa899336081d58 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/42] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 2922b158e0fb387bfdbb37d044bd1239aba0dba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/42] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 72bc27bc66fe8a538981df08e2e43ab507d42c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/42] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 9ac71fa1f92406a927e30fd57d7a32b17200fa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/42] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 65fca20a2a09504c7e5f7f027fb336107a69a871 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/42] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 2afd68da1714758a7db78e301df1571cd6365e88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/42] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4f46782c41f6e8a2e409479c05f3d6974639dc83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/42] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 47a30154bd5a1cce07d8ef223c146f54099dc294 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/42] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90c49ef02e5e84f0dca6cbb91ddf3f1f6d9a6994 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/42] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From a442590d55bb1d8d5e6a8399b37f66de6a1bb046 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/42] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9d710f6d3f7557c524824bd1f42084aa2e231788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/42] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 2a24ab3f25e31e998b30afbfa06ecd8865681986 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/42] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d6cec232767f4350ba80df26574918beb72fc0ba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/42] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 59036922923d4c6aae1c5c9edb48efabcdb0799e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/42] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 36b171818754a5c7408082925c64ed18e1e42a66 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/42] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 4c7c8a6a10d59c176dda0d05ac5399dfc93c2e2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/42] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 3d4d4a32021206fdc45648c653dffce11914ab87 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/42] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 73a51a36f7a1124d0b6f804b86de7c64e1f25faa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/42] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f93d751968ec9115acc26662fbd38be926519826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/42] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 45966392660ea74979a0dbc73a136e55777d9bdf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/42] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d95aebc775d5e940c78f0c58f6f43995a79b574a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/42] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 4173767073e1e9f2638afe3af98103770ed8a2db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/42] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 431c13c7a8c6007d088d78690e7f93725e758203 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/42] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From b186456ece6abbf073db1d717118ce74175dd402 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/42] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From d86ce1ac05124d399ddf22cf82f06b73b2039b3d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/42] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
From 0cf358fdcb48087a74a7058c8647fd78888dbce8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/42] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
From 81f86217853d2362bb6e4efff9ae60ecd082e7eb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/42] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
From ee2d3645f978eb2b6efdcd0c500767bf9c5f3760 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/42] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From bf4b821c21859e3b80dd6708184fa131b67f35c2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/42] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 9ec5ab7768c063a5b33301d534249cf2240efd85 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 41/42] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/soundkonverter/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 1101defdb875c1de098a405d5a469ff75e9210ad Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 42/42] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (20 preceding siblings ...)
2025-02-26 15:29 ` slymattz
@ 2025-02-26 20:54 ` slymattz
2025-02-27 13:00 ` [PR PATCH] [Updated] " slymattz
` (73 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-26 20:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1040 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
[WIP] taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 72798 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/42] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/42] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/42] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/42] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/42] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/42] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/42] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/42] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From bee96e1343caae880c94922ba0fc155a6715a143 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/42] ardour: update to 8.11
---
srcpkgs/ardour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..e4c4b9f3bb9f78 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
From 2a0f20b7f3a7cd16947e5ea1a6742a1ba364297a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/42] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From ae430f9093ac76d55997ac7cf599d9087d0c0d32 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/42] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From d38b49ea3daa50c33bb3860f592668b23de1c80f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/42] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From bc990d3a1561a2a5bb0f3cb940a83e1963ac1f2c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/42] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 139af77784c88fda1089791c1e0a5337a161f5e8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/42] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 15cd8f7d5aacfca3b74dab2841dc14793daa4b16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/42] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 8849602446b83299258dd54963950445acb399ca Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/42] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From db3e18bff003c2c18600702a584c7b843a7944bb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/42] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 4e194b9d412f6bd6e2f9613d1bff37e36e5bd310 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/42] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 5d33ceeba8eed4fa03d08a1f537af8ed2680e123 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/42] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 92cdfb95c42fd461d75db153a920a7992d8de71c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/42] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 8c2d51b7c7adb66e266ea0faae373260c2115503 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/42] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From b2edd1876c876b9c931714c4a77d01b46a583117 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/42] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 76cccdf3b37d25103bfbaa3e5be5e906d3393113 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/42] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From dcae15077cf7c8a998e76e2b08985d14ee2a5bc0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/42] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 1120ca034ec03b2a25f6f57fb534ded48cfe29ff Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/42] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 53b8c81d891b98ac17e92eefef552a0476b8a35a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/42] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 32d1c751b3b41abc0f6dea2785eb80c662241508 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/42] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 99f0edaf2b6646e43f7192e74ba21dd45affab85 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/42] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From cb1621ecce3ffa1c467145875963bcc7f9cf316a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/42] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From f8dbcad8f292b31c09d9e59d870e4abf39ff204a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/42] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 522f5d41a835afb5bcbdbfe7218f9b6cb07d00db Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/42] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From 1c4f39da22d38d910c74b164d5b6236157430b55 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/42] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 1ba1b8af84f0e70a66d17f1b11c99a65aa382fae Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/42] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 427529164cd6d02c94e742c3ae70b2e6370e7005 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/42] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From 999f9edfb371c6ed65293d393ad6bc52ed3b5326 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/42] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From fa090a95273deea1743ad1d65a4f87e0a4d0263a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/42] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
From 0666603650f41599afec2a4472f88f20e3631e15 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/42] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
From 8146877f9738dd2ab24574c864ccaf315abe13a5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/42] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
From 57b742541cdfd21db92b9591f8b9bddb67be6100 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/42] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From da345e043c3b7bc83b9fffea3e912446a2aabbcf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/42] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 932cb1b953cddeead589a396c90126c1876772fe Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 41/42] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/soundkonverter/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 59755bf4e82551c7c28f37f4297a0090160e717d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 42/42] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (21 preceding siblings ...)
2025-02-26 20:54 ` slymattz
@ 2025-02-27 13:00 ` slymattz
2025-02-27 13:59 ` slymattz
` (72 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-27 13:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1462 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
EDIT: **I'm going to compile every package for x86_64-musl and report back**
The other archs get green marks mainly because hdf5-devel cannot be cross-compiled so there's only a few packages that are cross-built:
```
=> ERROR: hdf5-devel-1.10.11_1: cannot be cross compiled...
=> ERROR: hdf5-devel-1.10.11_1: https://web.archive.org/web/20230924050239/https://portal.hdfgroup.org/pages/viewpage.action?pageId=48808266
```
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 74581 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/42] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/42] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/42] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/42] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/42] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/42] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/42] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/42] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From b2ee0a196409726697f073e0dd2a2efb4bc174a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/42] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From b322c6cc539fd40eb4012d5f1f9fd7d8253b71d1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/42] clementine: revbump for libtag
---
srcpkgs/clementine/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..9d735d6531cccb 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
post_install() {
rm -rf $DESTDIR/builddir
From 5e63967fb7496975e5a87cc4f5876c6170851b8e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/42] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From 475fd5ced8b376701b34749be3dbb18115a93c79 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/42] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 0f349b5ad849a50b392c3b86db078b61d5c8ef10 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/42] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 98600a7c18669286706da83684fb830847472538 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/42] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From a324c841840c742da38ee43c54cac216f6d40845 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/42] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 0a80ed8db301a3c7a17945d0278f75f922917e4b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/42] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From ddebb98a2124cc3cc3b55a950013045c544beae3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/42] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 3fd10b7de47d659c059b417ddf7bf6f0e9cdac5d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/42] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 7557fea3229cf17389409595cc41aabe246a420a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/42] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 868f75f8c28234ae173c5df870977d454ef1f45f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/42] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From d428ec55d55ba877758d25d4a5f64191cf60aa5d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/42] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From f473c30cf603ffd5d25b266c99e2cd8045ac129d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/42] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From f07772dfd3e0327e7d245ad6c63f6ad9def22af2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/42] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 4a33269831beb32088028bd83930143cd9256f52 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/42] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From e1333c2275a32e347f7587512d53dd30935db788 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/42] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From bb5a1ad55d0670e4eaa74d02e8b729c60f698cbf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/42] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 37d2e1b8140c379eeee71451d1453d95f124bd6a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/42] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From ea05bdd31d34e5b5a68b70f9e2148d6432deeead Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/42] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From ed1ed8d5d365f1c1a32b98c3eb92c570c8468b69 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/42] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From c004468b841d31d4b313e5b5b7169beb7857aba2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/42] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 1e1e9840e413c15e32e67e3d61eeab6d5d09e2e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/42] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From c99abe990f200a8ee050476cb025c838748ef011 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/42] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From da05a13215d1e073d4ee668894519dc9504ed176 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/42] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From c8e5209bd612fc8e99bd10c18386cecb81109fe7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/42] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From cb40f51bcb1aa0aca3efb79869a9bbedcef80955 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/42] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 0ce77cea29497ddba27c93791f9f7d26999ec25c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/42] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
From 59270d322e05d935cffd72ee751ebf0af1720744 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/42] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
From 5700db3654e761bfe6aabc2ad60d499c9bf984f8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/42] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
From 2c92c8753822d50393bf2a6b230e14b71e0f49ce Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/42] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From 05ba5f7363923f3ffc4943a3b964c33065ec876a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/42] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 8e0eeec9bfd79c29960015f7765fa2745d0d52a2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 41/42] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/soundkonverter/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From dd806a15da0bf346e6eabb1fc19a96d7622ad723 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 42/42] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (22 preceding siblings ...)
2025-02-27 13:00 ` [PR PATCH] [Updated] " slymattz
@ 2025-02-27 13:59 ` slymattz
2025-02-27 15:43 ` slymattz
` (71 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-27 13:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1462 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
EDIT: **I'm going to compile every package for x86_64-musl and report back**
The other archs get green marks mainly because hdf5-devel cannot be cross-compiled so there's only a few packages that are cross-built:
```
=> ERROR: hdf5-devel-1.10.11_1: cannot be cross compiled...
=> ERROR: hdf5-devel-1.10.11_1: https://web.archive.org/web/20230924050239/https://portal.hdfgroup.org/pages/viewpage.action?pageId=48808266
```
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 74744 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/42] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/42] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/42] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/42] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/42] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/42] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/42] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/42] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From b2ee0a196409726697f073e0dd2a2efb4bc174a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/42] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From ada25889e6dbce16a3ac040856f775acd45b19cd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/42] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 33ce8f415f577281a7ac5885e49600a9c775ca80 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/42] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From d12b6f087f4601739b2d90fbb4ac32735ffe8563 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/42] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 6d7e5e59acc4222ae3890813bed35335c82b79b1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/42] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From a99d8be8d9512cf37597e8b6c912ec9f831a1102 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/42] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 0c69a50ecefd69f28546f6fa61f89fa80c610aa9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/42] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From aebb04403f526fad7961fb4092d64de0439d123f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/42] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From c12990fa77c48b300d8c9a9cfedd57df36d02bdd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/42] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 141385dcfad72784fe1a3c85af85b1bf62ad43c3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/42] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From e40cab1f5c69eb84ec6592eec2d8d1569c51a6bf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/42] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c4bb7be74423da08c4d4446279a57fc5242b37d5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/42] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 650830e1e95a489f4834265103a08bca68560369 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/42] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 05256fbbd1106dc9b0f083a3238cf274120e1b9d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/42] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 65a26a26c3c63033b2251cf965083e28b9428d20 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/42] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d40b7f5e407122e7595a290a33bb80a69d616869 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/42] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From df928686f85eb0ef25b7ef29fd63eb7d4e9c0db0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/42] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 73fa5a553577893e51bafcbfbdcb566de68ee5e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/42] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From b4e421fd0eeb2316f21eef26c014c3f3927bb4e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/42] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 755d1567e860da4923f2c899ee0977488b4cfe29 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/42] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 0b361a5f507563b4d5503bf29726782d7ddb3ef9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/42] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 6850990ef52d5932e23b1cd0f93a4c0e809e7154 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/42] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 59440ddb0593083590532165a6b896e7b2e93621 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/42] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From b715b8fb66b7d98c7cd12796e303157927e37d73 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/42] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 5850defa5c8bba91ba884af31b2e1f0eee85f4a8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/42] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From b7bec15445881096f4601c26ca33b58804bd2f54 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/42] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From ba64a8c45ab84f2c48c6d9cb43beb679ac70f106 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/42] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 883ae2f44115e23fc10ac9bb5fc1740f6a68a0f1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/42] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
From 4c4d7042f02d461dc63c6073f933b2f471251822 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/42] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
From 651f1fc0cb73ae3258282778a549f12c19d2e853 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/42] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
From a3098c41f3b5116bd6202500c5af91aa1199e19b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/42] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From b53e58cc4072b1b13ca0c37950c23bf589ad4f37 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/42] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From ecbea436db22790913beafb95fa3422e312ff144 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 41/42] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/soundkonverter/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 04b90519e1c1974defda1b9b2fc09b89e4e2fa6e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 42/42] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (23 preceding siblings ...)
2025-02-27 13:59 ` slymattz
@ 2025-02-27 15:43 ` slymattz
2025-02-27 19:55 ` slymattz
` (70 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-27 15:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1071 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 74744 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/42] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/42] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/42] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/42] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/42] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/42] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/42] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/42] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From b2ee0a196409726697f073e0dd2a2efb4bc174a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/42] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From ada25889e6dbce16a3ac040856f775acd45b19cd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/42] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 33ce8f415f577281a7ac5885e49600a9c775ca80 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/42] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From d12b6f087f4601739b2d90fbb4ac32735ffe8563 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/42] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 6d7e5e59acc4222ae3890813bed35335c82b79b1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/42] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From a99d8be8d9512cf37597e8b6c912ec9f831a1102 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/42] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 0c69a50ecefd69f28546f6fa61f89fa80c610aa9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/42] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From aebb04403f526fad7961fb4092d64de0439d123f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/42] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From c12990fa77c48b300d8c9a9cfedd57df36d02bdd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/42] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 141385dcfad72784fe1a3c85af85b1bf62ad43c3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/42] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From e40cab1f5c69eb84ec6592eec2d8d1569c51a6bf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/42] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c4bb7be74423da08c4d4446279a57fc5242b37d5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/42] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 650830e1e95a489f4834265103a08bca68560369 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/42] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 05256fbbd1106dc9b0f083a3238cf274120e1b9d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/42] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 65a26a26c3c63033b2251cf965083e28b9428d20 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/42] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d40b7f5e407122e7595a290a33bb80a69d616869 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/42] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From df928686f85eb0ef25b7ef29fd63eb7d4e9c0db0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/42] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 73fa5a553577893e51bafcbfbdcb566de68ee5e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/42] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From b4e421fd0eeb2316f21eef26c014c3f3927bb4e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/42] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 755d1567e860da4923f2c899ee0977488b4cfe29 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/42] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 0b361a5f507563b4d5503bf29726782d7ddb3ef9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/42] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 6850990ef52d5932e23b1cd0f93a4c0e809e7154 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/42] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 59440ddb0593083590532165a6b896e7b2e93621 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/42] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From b715b8fb66b7d98c7cd12796e303157927e37d73 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/42] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 5850defa5c8bba91ba884af31b2e1f0eee85f4a8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/42] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From b7bec15445881096f4601c26ca33b58804bd2f54 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/42] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From ba64a8c45ab84f2c48c6d9cb43beb679ac70f106 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/42] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 883ae2f44115e23fc10ac9bb5fc1740f6a68a0f1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/42] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
From 4c4d7042f02d461dc63c6073f933b2f471251822 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/42] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
From 651f1fc0cb73ae3258282778a549f12c19d2e853 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/42] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
From a3098c41f3b5116bd6202500c5af91aa1199e19b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/42] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From b53e58cc4072b1b13ca0c37950c23bf589ad4f37 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/42] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From ecbea436db22790913beafb95fa3422e312ff144 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 41/42] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/soundkonverter/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 0549bd04a9c5ee69795eadfa36685d2e538e774c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 42/42] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (24 preceding siblings ...)
2025-02-27 15:43 ` slymattz
@ 2025-02-27 19:55 ` slymattz
2025-02-27 20:00 ` slymattz
` (69 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-27 19:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1071 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 75217 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/42] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/42] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/42] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/42] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/42] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/42] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/42] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/42] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From b2ee0a196409726697f073e0dd2a2efb4bc174a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/42] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From ada25889e6dbce16a3ac040856f775acd45b19cd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/42] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 33ce8f415f577281a7ac5885e49600a9c775ca80 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/42] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From d12b6f087f4601739b2d90fbb4ac32735ffe8563 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/42] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 6d7e5e59acc4222ae3890813bed35335c82b79b1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/42] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From a99d8be8d9512cf37597e8b6c912ec9f831a1102 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/42] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 0c69a50ecefd69f28546f6fa61f89fa80c610aa9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/42] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From aebb04403f526fad7961fb4092d64de0439d123f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/42] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From c12990fa77c48b300d8c9a9cfedd57df36d02bdd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/42] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 141385dcfad72784fe1a3c85af85b1bf62ad43c3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/42] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From e40cab1f5c69eb84ec6592eec2d8d1569c51a6bf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/42] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c4bb7be74423da08c4d4446279a57fc5242b37d5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/42] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 650830e1e95a489f4834265103a08bca68560369 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/42] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 05256fbbd1106dc9b0f083a3238cf274120e1b9d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/42] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 65a26a26c3c63033b2251cf965083e28b9428d20 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/42] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d40b7f5e407122e7595a290a33bb80a69d616869 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/42] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From df928686f85eb0ef25b7ef29fd63eb7d4e9c0db0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/42] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 73fa5a553577893e51bafcbfbdcb566de68ee5e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/42] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From b4e421fd0eeb2316f21eef26c014c3f3927bb4e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/42] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 755d1567e860da4923f2c899ee0977488b4cfe29 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/42] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 0b361a5f507563b4d5503bf29726782d7ddb3ef9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/42] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 6850990ef52d5932e23b1cd0f93a4c0e809e7154 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/42] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 59440ddb0593083590532165a6b896e7b2e93621 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/42] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From b715b8fb66b7d98c7cd12796e303157927e37d73 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/42] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 5850defa5c8bba91ba884af31b2e1f0eee85f4a8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/42] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From b7bec15445881096f4601c26ca33b58804bd2f54 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/42] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From ba64a8c45ab84f2c48c6d9cb43beb679ac70f106 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/42] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 4271a94fe6c6b634a0c46147236db2170ba0ba86 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/42] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2884559c92a491..1cb7ada362d8ab 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From f313edd3796383e12e9f31886659a081f7f5dea8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/42] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
3 files changed, 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
From 9544dc6447259bd05f2ead482e0b17d4eabbc832 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/42] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
From ed5468dd9548499162d28284e1bf63067b81fb2f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/42] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From 9e3f467750df88832f7f23a85cd19ef5fa4b8e72 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/42] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 3d49f90fec1a1e985e5090ad91f02cc32093046b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 41/42] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/soundkonverter/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 988b21de36cca22690d03183e659f84ef9a1f7bf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 42/42] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (25 preceding siblings ...)
2025-02-27 19:55 ` slymattz
@ 2025-02-27 20:00 ` slymattz
2025-02-27 20:05 ` slymattz
` (68 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-27 20:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1071 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 75759 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/42] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/42] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/42] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/42] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/42] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/42] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/42] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/42] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From b2ee0a196409726697f073e0dd2a2efb4bc174a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/42] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From ada25889e6dbce16a3ac040856f775acd45b19cd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/42] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 33ce8f415f577281a7ac5885e49600a9c775ca80 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/42] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From d12b6f087f4601739b2d90fbb4ac32735ffe8563 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/42] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 6d7e5e59acc4222ae3890813bed35335c82b79b1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/42] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From a99d8be8d9512cf37597e8b6c912ec9f831a1102 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/42] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 0c69a50ecefd69f28546f6fa61f89fa80c610aa9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/42] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From aebb04403f526fad7961fb4092d64de0439d123f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/42] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From c12990fa77c48b300d8c9a9cfedd57df36d02bdd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/42] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 141385dcfad72784fe1a3c85af85b1bf62ad43c3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/42] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From e40cab1f5c69eb84ec6592eec2d8d1569c51a6bf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/42] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c4bb7be74423da08c4d4446279a57fc5242b37d5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/42] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 650830e1e95a489f4834265103a08bca68560369 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/42] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 05256fbbd1106dc9b0f083a3238cf274120e1b9d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/42] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 65a26a26c3c63033b2251cf965083e28b9428d20 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/42] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d40b7f5e407122e7595a290a33bb80a69d616869 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/42] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From df928686f85eb0ef25b7ef29fd63eb7d4e9c0db0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/42] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 73fa5a553577893e51bafcbfbdcb566de68ee5e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/42] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From b4e421fd0eeb2316f21eef26c014c3f3927bb4e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/42] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 755d1567e860da4923f2c899ee0977488b4cfe29 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/42] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 0b361a5f507563b4d5503bf29726782d7ddb3ef9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/42] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 6850990ef52d5932e23b1cd0f93a4c0e809e7154 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/42] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 59440ddb0593083590532165a6b896e7b2e93621 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/42] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From b715b8fb66b7d98c7cd12796e303157927e37d73 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/42] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 5850defa5c8bba91ba884af31b2e1f0eee85f4a8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/42] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From b7bec15445881096f4601c26ca33b58804bd2f54 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/42] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From ba64a8c45ab84f2c48c6d9cb43beb679ac70f106 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/42] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 4271a94fe6c6b634a0c46147236db2170ba0ba86 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/42] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2884559c92a491..1cb7ada362d8ab 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 314f6aeddcd18fe58f45bc9b86e48ec6f3badacf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/42] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1cb7ada362d8ab..5d67cd5654b94e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From 8c5fff29936dbee4f1044d08dd9f029afea1ef5c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/42] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
3 files changed, 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
From eccc91e8dfa207d6d161254aafdafca2adee80f8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/42] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From 4345f21f08f95f96cd81b71a5b13a2bdf8db1baf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/42] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From fe307633431e7fcde6a791dfdfb0163c045642ed Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 41/42] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/soundkonverter/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 855ff0ba98d5a108b1cc589fbe46e6cd4b7d3e2e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 42/42] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (26 preceding siblings ...)
2025-02-27 20:00 ` slymattz
@ 2025-02-27 20:05 ` slymattz
2025-02-27 20:12 ` slymattz
` (67 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-27 20:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1071 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 76198 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/42] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/42] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/42] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/42] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/42] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/42] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/42] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/42] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From b2ee0a196409726697f073e0dd2a2efb4bc174a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/42] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From ada25889e6dbce16a3ac040856f775acd45b19cd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/42] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 33ce8f415f577281a7ac5885e49600a9c775ca80 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/42] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From d12b6f087f4601739b2d90fbb4ac32735ffe8563 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/42] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 6d7e5e59acc4222ae3890813bed35335c82b79b1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/42] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From a99d8be8d9512cf37597e8b6c912ec9f831a1102 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/42] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 0c69a50ecefd69f28546f6fa61f89fa80c610aa9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/42] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From aebb04403f526fad7961fb4092d64de0439d123f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/42] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From c12990fa77c48b300d8c9a9cfedd57df36d02bdd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/42] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 141385dcfad72784fe1a3c85af85b1bf62ad43c3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/42] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From e40cab1f5c69eb84ec6592eec2d8d1569c51a6bf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/42] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c4bb7be74423da08c4d4446279a57fc5242b37d5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/42] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 650830e1e95a489f4834265103a08bca68560369 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/42] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 05256fbbd1106dc9b0f083a3238cf274120e1b9d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/42] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 65a26a26c3c63033b2251cf965083e28b9428d20 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/42] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d40b7f5e407122e7595a290a33bb80a69d616869 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/42] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From df928686f85eb0ef25b7ef29fd63eb7d4e9c0db0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/42] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 73fa5a553577893e51bafcbfbdcb566de68ee5e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/42] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From b4e421fd0eeb2316f21eef26c014c3f3927bb4e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/42] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 755d1567e860da4923f2c899ee0977488b4cfe29 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/42] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 0b361a5f507563b4d5503bf29726782d7ddb3ef9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/42] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 6850990ef52d5932e23b1cd0f93a4c0e809e7154 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/42] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 59440ddb0593083590532165a6b896e7b2e93621 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/42] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From b715b8fb66b7d98c7cd12796e303157927e37d73 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/42] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 5850defa5c8bba91ba884af31b2e1f0eee85f4a8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/42] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From b7bec15445881096f4601c26ca33b58804bd2f54 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/42] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From ba64a8c45ab84f2c48c6d9cb43beb679ac70f106 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/42] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 4271a94fe6c6b634a0c46147236db2170ba0ba86 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/42] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2884559c92a491..1cb7ada362d8ab 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 314f6aeddcd18fe58f45bc9b86e48ec6f3badacf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/42] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1cb7ada362d8ab..5d67cd5654b94e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From 1b53d3edbd361319808981baf70d1377566a0c79 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/42] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5d67cd5654b94e..83cd9380738800 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 1276fe23504b4e7d7ff909d510356c9ceb1c5a96 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/42] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From 1dd17e076a3628ea64e163e4a9d592f285a17ce3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/42] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 7c48efc0374347722b29ef66c3fe646ed39c6c15 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 41/42] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/soundkonverter/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From fb15f957287c0e7193b0cbf1e076a3796941fe8f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 42/42] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (27 preceding siblings ...)
2025-02-27 20:05 ` slymattz
@ 2025-02-27 20:12 ` slymattz
2025-02-28 13:18 ` slymattz
` (66 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-27 20:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1071 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 76891 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/42] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/42] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/42] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/42] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/42] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/42] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/42] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/42] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From b2ee0a196409726697f073e0dd2a2efb4bc174a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/42] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From ada25889e6dbce16a3ac040856f775acd45b19cd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/42] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 33ce8f415f577281a7ac5885e49600a9c775ca80 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/42] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From d12b6f087f4601739b2d90fbb4ac32735ffe8563 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/42] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 6d7e5e59acc4222ae3890813bed35335c82b79b1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/42] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From a99d8be8d9512cf37597e8b6c912ec9f831a1102 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/42] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 0c69a50ecefd69f28546f6fa61f89fa80c610aa9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/42] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From aebb04403f526fad7961fb4092d64de0439d123f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/42] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From c12990fa77c48b300d8c9a9cfedd57df36d02bdd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/42] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 141385dcfad72784fe1a3c85af85b1bf62ad43c3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/42] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From e40cab1f5c69eb84ec6592eec2d8d1569c51a6bf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/42] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c4bb7be74423da08c4d4446279a57fc5242b37d5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/42] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 650830e1e95a489f4834265103a08bca68560369 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/42] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 05256fbbd1106dc9b0f083a3238cf274120e1b9d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/42] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 65a26a26c3c63033b2251cf965083e28b9428d20 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/42] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d40b7f5e407122e7595a290a33bb80a69d616869 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/42] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From df928686f85eb0ef25b7ef29fd63eb7d4e9c0db0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/42] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 73fa5a553577893e51bafcbfbdcb566de68ee5e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/42] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From b4e421fd0eeb2316f21eef26c014c3f3927bb4e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:41:16 +0100
Subject: [PATCH 27/42] New package: msgsl-4.1.0
---
srcpkgs/msgsl/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/msgsl/template
diff --git a/srcpkgs/msgsl/template b/srcpkgs/msgsl/template
new file mode 100644
index 00000000000000..db01666867aeeb
--- /dev/null
+++ b/srcpkgs/msgsl/template
@@ -0,0 +1,18 @@
+# Template file for 'msgsl'
+pkgname=msgsl
+version=4.1.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST=ON -DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config git"
+makedepends="gtest-devel"
+short_desc="C++ Guideline Support Library implementation by Microsoft"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/v${version}.tar.gz"
+checksum=0a227fc9c8e0bf25115f401b9a46c2a68cd28f299d24ab195284eb3f1d7794bd
+
+post_install() {
+ vlicense LICENSE
+}
From 755d1567e860da4923f2c899ee0977488b4cfe29 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 28/42] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 0b361a5f507563b4d5503bf29726782d7ddb3ef9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 29/42] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 6850990ef52d5932e23b1cd0f93a4c0e809e7154 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 30/42] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 59440ddb0593083590532165a6b896e7b2e93621 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 31/42] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From b715b8fb66b7d98c7cd12796e303157927e37d73 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 32/42] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 5850defa5c8bba91ba884af31b2e1f0eee85f4a8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 33/42] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From b7bec15445881096f4601c26ca33b58804bd2f54 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 34/42] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From ba64a8c45ab84f2c48c6d9cb43beb679ac70f106 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 35/42] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 4271a94fe6c6b634a0c46147236db2170ba0ba86 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 36/42] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2884559c92a491..1cb7ada362d8ab 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 314f6aeddcd18fe58f45bc9b86e48ec6f3badacf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 37/42] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1cb7ada362d8ab..5d67cd5654b94e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From 1b53d3edbd361319808981baf70d1377566a0c79 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 38/42] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5d67cd5654b94e..83cd9380738800 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 1276fe23504b4e7d7ff909d510356c9ceb1c5a96 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 39/42] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From 1dd17e076a3628ea64e163e4a9d592f285a17ce3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 40/42] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 65d82ab3f3a862a0ab97a02385a28076aef3320d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 41/42] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 3 ++-
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 2 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83cd9380738800..f8918fe2a75667 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20250113
+version=0.1.20250227
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -821,6 +821,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 10cf21b4c173c373adfb1bb1d6a143d58e41c46f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 42/42] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (28 preceding siblings ...)
2025-02-27 20:12 ` slymattz
@ 2025-02-28 13:18 ` slymattz
2025-02-28 13:19 ` slymattz
` (65 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-28 13:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1194 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT: my bad. _msgsl_ already exists in the repo under the name of _guidelines-support-library_
I will fix this later.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 75793 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From b2ee0a196409726697f073e0dd2a2efb4bc174a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From ada25889e6dbce16a3ac040856f775acd45b19cd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 33ce8f415f577281a7ac5885e49600a9c775ca80 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From d12b6f087f4601739b2d90fbb4ac32735ffe8563 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 6d7e5e59acc4222ae3890813bed35335c82b79b1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From a99d8be8d9512cf37597e8b6c912ec9f831a1102 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 0c69a50ecefd69f28546f6fa61f89fa80c610aa9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From aebb04403f526fad7961fb4092d64de0439d123f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From c12990fa77c48b300d8c9a9cfedd57df36d02bdd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 141385dcfad72784fe1a3c85af85b1bf62ad43c3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From e40cab1f5c69eb84ec6592eec2d8d1569c51a6bf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c4bb7be74423da08c4d4446279a57fc5242b37d5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 650830e1e95a489f4834265103a08bca68560369 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 05256fbbd1106dc9b0f083a3238cf274120e1b9d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 65a26a26c3c63033b2251cf965083e28b9428d20 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d40b7f5e407122e7595a290a33bb80a69d616869 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/41] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From df928686f85eb0ef25b7ef29fd63eb7d4e9c0db0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 73fa5a553577893e51bafcbfbdcb566de68ee5e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 43a52b2f85e537abfac5b17355c53a4f2b9992c5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 27/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..b7ab4dbe5cea38 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel msgsl openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 5aff034ea9fc349afc9cb0e8af793421994ad8ac Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 28/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 1be2dd51781bdb7d1fcb207704dc20c58503c5de Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 29/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 9c023dc907a1809da288098a10b6df5a84cf7c2a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 30/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From d85eb29c2c94ed09b42701416b66ce1f47aaa2da Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 31/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 212f84e3250a570ff61148bb180bb90192073858 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 32/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 56efb4669e44fa4bae6178d236cdfbb8f7062768 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 33/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From 3f4e69720bf367d8409f6ddceced31064b6bd8af Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 34/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From b30d573e2006adb5f806e7ea8ac5fbe23f905d57 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 35/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2884559c92a491..1cb7ada362d8ab 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 9b4a45b6c45f9cb5a67f9a5962d5f27f9c5cea9b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 36/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1cb7ada362d8ab..5d67cd5654b94e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From da8e94b75031886dff3a164dc7e2b49a3e657ad3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 37/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5d67cd5654b94e..83cd9380738800 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 4712500301019e95b4103f03e5e5b4802fca9084 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 38/41] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From 2aef240cd2fd041eaf488c3d0276ca7467ab0419 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 39/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From d84c0ff5d25c26be44ec45876fe0d23f8aee0a7e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 40/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 3 ++-
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 2 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83cd9380738800..f8918fe2a75667 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20250113
+version=0.1.20250227
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -821,6 +821,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 8d2069b9d4236675dddf0cc72a4141b5524d273d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 41/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (29 preceding siblings ...)
2025-02-28 13:18 ` slymattz
@ 2025-02-28 13:19 ` slymattz
2025-02-28 20:19 ` slymattz
` (64 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-28 13:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1194 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT: my bad. _msgsl_ already exists in the repo under the name of _guidelines-support-library_
I will fix this later.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 75814 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From b2ee0a196409726697f073e0dd2a2efb4bc174a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From ada25889e6dbce16a3ac040856f775acd45b19cd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 33ce8f415f577281a7ac5885e49600a9c775ca80 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From d12b6f087f4601739b2d90fbb4ac32735ffe8563 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 6d7e5e59acc4222ae3890813bed35335c82b79b1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From a99d8be8d9512cf37597e8b6c912ec9f831a1102 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 0c69a50ecefd69f28546f6fa61f89fa80c610aa9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From aebb04403f526fad7961fb4092d64de0439d123f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From c12990fa77c48b300d8c9a9cfedd57df36d02bdd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 141385dcfad72784fe1a3c85af85b1bf62ad43c3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From e40cab1f5c69eb84ec6592eec2d8d1569c51a6bf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c4bb7be74423da08c4d4446279a57fc5242b37d5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 650830e1e95a489f4834265103a08bca68560369 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 05256fbbd1106dc9b0f083a3238cf274120e1b9d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 65a26a26c3c63033b2251cf965083e28b9428d20 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d40b7f5e407122e7595a290a33bb80a69d616869 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/41] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From df928686f85eb0ef25b7ef29fd63eb7d4e9c0db0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 73fa5a553577893e51bafcbfbdcb566de68ee5e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 153ec75fcf4c13266babab4685ae5a930a0cdcda Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 27/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From ac01f091deea84b9cfed9735299bd654bc38fc1e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 28/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 16702e59495cc9a34a01ace2c36775229809eec6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 29/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From f5af6c58d6fd9094a4fb07d6800b978ea90e856d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 30/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From b7486aae93814ffdebb7bf8c678098db35f46a52 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 31/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 5be4c2503d84d81cbeb08f313df4217754caa7dc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 32/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 587d66917f44c43e9b49f83d34e83298d150cf7d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 33/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From 7b0d65dfcd7e078c2cb8f6c20421bf540e04e531 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 34/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 92eaa5879f88c9174d9b825df224a78fa00e7650 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 35/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2884559c92a491..1cb7ada362d8ab 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 3c656c011a1b815d0304213c8aa0c634e6cf9007 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 36/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1cb7ada362d8ab..5d67cd5654b94e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From b78d09eb12a28c6365b3c9d45257a5f80920df70 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 37/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5d67cd5654b94e..83cd9380738800 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 7e02d119d682a362743f9cd988765b0714630cd9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 38/41] ncmpcpp: disable taglib
the latest release is from 2021 and doesn't build with taglib2
---
srcpkgs/ncmpcpp/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..058d8f3a4c0f25 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,13 +1,14 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
+ --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw
+ --without-taglib"
hostmakedepends="pkg-config"
makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+ readline-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
From 19b7da198f8d2625cc171711a32f71b4d033ab09 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 39/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 78031f5d36e1e012ccb15dcae6cb02116f496b83 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 40/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 3 ++-
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 2 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83cd9380738800..f8918fe2a75667 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20250113
+version=0.1.20250227
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -821,6 +821,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From e0f25d51f23870c5f25034299c6dbab78d11a5cf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 41/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (30 preceding siblings ...)
2025-02-28 13:19 ` slymattz
@ 2025-02-28 20:19 ` slymattz
2025-03-01 9:58 ` slymattz
` (63 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-02-28 20:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 970 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/54493#issuecomment-2691478528
Comment:
So it turns out the builds for x86_64-{glibc,musl} complete fine. As I was told on IRC, CI complains about a removed package and that is normal.
```
id3ted-1.0_2: broken, unresolvable shlib `libtag.so.1'
Transaction aborted due to unresolved shlibs.
Failed to install 'taglib' and 'id3ted-1.0_2'
Error: Process completed with exit code 1.
```
In my opinion the PR is worth merging. Of course, there's four packages which are no longer maintained and can be therefore removed but I think there are more benefits from upgrading taglib even at the cost of these four packages.
Strawberry, for instance, requires taglib2 now and my guess is a lot of people use this software. Taglib2 will certainly be more futureproof as it's been around for over a year now and I suppose a lot of software will require versions >= 2.0.
^ permalink raw reply [flat|nested] 97+ messages in thread
* Re: taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (31 preceding siblings ...)
2025-02-28 20:19 ` slymattz
@ 2025-03-01 9:58 ` slymattz
2025-03-01 12:51 ` [PR PATCH] [Updated] " slymattz
` (62 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-01 9:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 934 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/54493#issuecomment-2691478528
Comment:
So it turns out the builds for x86_64-{glibc,musl} complete fine. As I was told on IRC, CI complains about a removed package and that is normal.
```
id3ted-1.0_2: broken, unresolvable shlib `libtag.so.1'
Transaction aborted due to unresolved shlibs.
Failed to install 'taglib' and 'id3ted-1.0_2'
Error: Process completed with exit code 1.
```
In my opinion the PR is worth merging. Of course, there's four packages which are no longer maintained and can be therefore removed but I think there are more benefits from upgrading taglib even at the cost of these four packages.
Strawberry, for instance, requires taglib2 now. Taglib2 will certainly be more futureproof as it's been around for over a year now and I suppose a lot of software will require versions >= 2.0 at some point.
^ permalink raw reply [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (32 preceding siblings ...)
2025-03-01 9:58 ` slymattz
@ 2025-03-01 12:51 ` slymattz
2025-03-01 13:24 ` slymattz
` (61 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-01 12:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT: I was able to find a patch for [ncmpcpp](https://github.com/ncmpcpp/ncmpcpp/commit/dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5.patch) that fixes compilation issues with taglib2 so instead of disabling this tag-related feature, we can keep it enabled :)
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 77801 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From b2ee0a196409726697f073e0dd2a2efb4bc174a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From ada25889e6dbce16a3ac040856f775acd45b19cd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 33ce8f415f577281a7ac5885e49600a9c775ca80 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From d12b6f087f4601739b2d90fbb4ac32735ffe8563 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 6d7e5e59acc4222ae3890813bed35335c82b79b1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From a99d8be8d9512cf37597e8b6c912ec9f831a1102 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 0c69a50ecefd69f28546f6fa61f89fa80c610aa9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From aebb04403f526fad7961fb4092d64de0439d123f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From c12990fa77c48b300d8c9a9cfedd57df36d02bdd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 141385dcfad72784fe1a3c85af85b1bf62ad43c3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From e40cab1f5c69eb84ec6592eec2d8d1569c51a6bf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c4bb7be74423da08c4d4446279a57fc5242b37d5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 650830e1e95a489f4834265103a08bca68560369 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 05256fbbd1106dc9b0f083a3238cf274120e1b9d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 65a26a26c3c63033b2251cf965083e28b9428d20 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d40b7f5e407122e7595a290a33bb80a69d616869 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/41] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From df928686f85eb0ef25b7ef29fd63eb7d4e9c0db0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 73fa5a553577893e51bafcbfbdcb566de68ee5e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 153ec75fcf4c13266babab4685ae5a930a0cdcda Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 27/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From ac01f091deea84b9cfed9735299bd654bc38fc1e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 28/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 16702e59495cc9a34a01ace2c36775229809eec6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 29/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From f5af6c58d6fd9094a4fb07d6800b978ea90e856d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 30/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From b7486aae93814ffdebb7bf8c678098db35f46a52 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 31/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 5be4c2503d84d81cbeb08f313df4217754caa7dc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 32/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 587d66917f44c43e9b49f83d34e83298d150cf7d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 33/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From 7b0d65dfcd7e078c2cb8f6c20421bf540e04e531 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 34/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 92eaa5879f88c9174d9b825df224a78fa00e7650 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 35/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2884559c92a491..1cb7ada362d8ab 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 3c656c011a1b815d0304213c8aa0c634e6cf9007 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 36/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1cb7ada362d8ab..5d67cd5654b94e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From b78d09eb12a28c6365b3c9d45257a5f80920df70 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 37/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5d67cd5654b94e..83cd9380738800 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 5366b6174fef6e91014a18ae0b67df26ef964b40 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 38/41] ncmpcpp: revbump for libtag
---
srcpkgs/ncmpcpp/patches/taglib2.patch | 49 +++++++++++++++++++++++++++
srcpkgs/ncmpcpp/template | 2 +-
2 files changed, 50 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2.patch
diff --git a/srcpkgs/ncmpcpp/patches/taglib2.patch b/srcpkgs/ncmpcpp/patches/taglib2.patch
new file mode 100644
index 00000000000000..fac6b0120231cb
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2.patch
@@ -0,0 +1,49 @@
+From dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Wed, 7 Feb 2024 14:28:26 +0100
+Subject: [PATCH] Fix compilation with taglib 2.0
+
+---
+ src/tags.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/tags.cpp b/src/tags.cpp
+index 6cd6a8c27..6395807ae 100644
+--- a/src/tags.cpp
++++ b/src/tags.cpp
+@@ -123,12 +123,12 @@ void writeCommonTags(const MPD::MutableSong &s, TagLib::Tag *tag)
+ tag->setArtist(ToWString(s.getArtist()));
+ tag->setAlbum(ToWString(s.getAlbum()));
+ try {
+- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate()));
++ tag->setYear(boost::lexical_cast<unsigned>(s.getDate()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+ try {
+- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack()));
++ tag->setTrack(boost::lexical_cast<unsigned>(s.getTrack()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+@@ -261,7 +261,7 @@ void read(mpd_song *s)
+ if (f.isNull())
+ return;
+
+- setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->length()));
++ setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->lengthInSeconds()));
+
+ if (auto mpeg_file = dynamic_cast<TagLib::MPEG::File *>(f.file()))
+ {
+@@ -306,7 +306,10 @@ bool write(MPD::MutableSong &s)
+ {
+ writeID3v2Tags(s, mpeg_file->ID3v2Tag(true));
+ // write id3v2.4 tags only
+- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))
++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2,
++ TagLib::File::StripOthers,
++ TagLib::ID3v2::v4,
++ TagLib::File::DoNotDuplicate))
+ return false;
+ // do not call generic save() as it will duplicate tags
+ saved = true;
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..02f26388eed645 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 060b58a1b8f8adcc380f91fd11a1fded34595dcd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 39/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 0460d943ab2c172792404e04b0b8c00ed9762281 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 40/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 3 ++-
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 2 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83cd9380738800..f8918fe2a75667 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20250113
+version=0.1.20250227
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -821,6 +821,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 7c450c5df8fe2365040c6062caecc5612c35c5ed Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 41/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (33 preceding siblings ...)
2025-03-01 12:51 ` [PR PATCH] [Updated] " slymattz
@ 2025-03-01 13:24 ` slymattz
2025-03-02 11:53 ` slymattz
` (60 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-01 13:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1439 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT: I was able to find two patches for [ncmpcpp](https://github.com/ncmpcpp/ncmpcpp/commit/dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5.patch) [ncmpcpp_extras](https://github.com/ncmpcpp/ncmpcpp/commit/81e5cf58b44be4ec0dc50722e2ed6d534df3973d.patch) that fix compilation issues with taglib2 so instead of disabling this tag-related feature, we can keep it enabled :)
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 79032 bytes --]
From 14403c319ba8276fb00fb0fc6c3900ccac61a129 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 659e4a45db77a8..6532cfeff6d02a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c4a697f03f258a46016fccfd4f8ed8120169bbef Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 9b61fb913ee53511dfa76c759a760d474d5d2fb3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 33624339f7d245ad6bbec64c1be70486fceb54cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 49e28d49dd30499bd9c4e5596337b25d5a26efb6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 4608639db3ff167260b3d21771e149a73f516a7c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 5b3f01f47f8befb0a32314e9f18fa2dd340bd42c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d42958f308bb0fc42f36eb254910ce6cd31a94e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From b2ee0a196409726697f073e0dd2a2efb4bc174a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From ada25889e6dbce16a3ac040856f775acd45b19cd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 33ce8f415f577281a7ac5885e49600a9c775ca80 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From d12b6f087f4601739b2d90fbb4ac32735ffe8563 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 6d7e5e59acc4222ae3890813bed35335c82b79b1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From a99d8be8d9512cf37597e8b6c912ec9f831a1102 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 0c69a50ecefd69f28546f6fa61f89fa80c610aa9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From aebb04403f526fad7961fb4092d64de0439d123f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:54:18 +0100
Subject: [PATCH 16/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index e7f5e8f82475e4..521d09328185a2 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From c12990fa77c48b300d8c9a9cfedd57df36d02bdd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 17/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 141385dcfad72784fe1a3c85af85b1bf62ad43c3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 18/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From e40cab1f5c69eb84ec6592eec2d8d1569c51a6bf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 19/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From c4bb7be74423da08c4d4446279a57fc5242b37d5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:14:35 +0100
Subject: [PATCH 20/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index c1c6a607cb2fca..e6f199138d79f6 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 650830e1e95a489f4834265103a08bca68560369 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 21/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 05256fbbd1106dc9b0f083a3238cf274120e1b9d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 22/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 65a26a26c3c63033b2251cf965083e28b9428d20 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:21:06 +0100
Subject: [PATCH 23/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index a34632b8e7608e..f6035cbea04fe5 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d40b7f5e407122e7595a290a33bb80a69d616869 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:31:05 +0100
Subject: [PATCH 24/41] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 1086592e0f1196..95b79cc86e2e50 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=1
+revision=2
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From df928686f85eb0ef25b7ef29fd63eb7d4e9c0db0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 25/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 73fa5a553577893e51bafcbfbdcb566de68ee5e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 26/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 153ec75fcf4c13266babab4685ae5a930a0cdcda Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 27/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From ac01f091deea84b9cfed9735299bd654bc38fc1e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 28/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 16702e59495cc9a34a01ace2c36775229809eec6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 29/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From f5af6c58d6fd9094a4fb07d6800b978ea90e856d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 30/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From b7486aae93814ffdebb7bf8c678098db35f46a52 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 31/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 5be4c2503d84d81cbeb08f313df4217754caa7dc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 32/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 587d66917f44c43e9b49f83d34e83298d150cf7d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 33/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From 7b0d65dfcd7e078c2cb8f6c20421bf540e04e531 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 34/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 92eaa5879f88c9174d9b825df224a78fa00e7650 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 35/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 2884559c92a491..1cb7ada362d8ab 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 3c656c011a1b815d0304213c8aa0c634e6cf9007 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 36/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6532cfeff6d02a..5ed9fccfa2c644 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1cb7ada362d8ab..5d67cd5654b94e 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From b78d09eb12a28c6365b3c9d45257a5f80920df70 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 37/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5d67cd5654b94e..83cd9380738800 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From cd9906d40f828d5afeed0032341df7ec7f73384c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 38/41] ncmpcpp: revbump for libtag
---
srcpkgs/ncmpcpp/patches/taglib2-extras.patch | 22 +++++++++
srcpkgs/ncmpcpp/patches/taglib2.patch | 49 ++++++++++++++++++++
srcpkgs/ncmpcpp/template | 2 +-
3 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2-extras.patch
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2.patch
diff --git a/srcpkgs/ncmpcpp/patches/taglib2-extras.patch b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
new file mode 100644
index 00000000000000..8c362b68ad2c73
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
@@ -0,0 +1,22 @@
+From 81e5cf58b44be4ec0dc50722e2ed6d534df3973d Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Thu, 30 May 2024 14:58:09 +0200
+Subject: [PATCH] extras: fix compilation with taglib 2.0
+
+---
+ extras/artist_to_albumartist.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extras/artist_to_albumartist.cpp b/extras/artist_to_albumartist.cpp
+index c3ddfee3a..0349d0aed 100644
+--- a/extras/artist_to_albumartist.cpp
++++ b/extras/artist_to_albumartist.cpp
+@@ -34,7 +34,7 @@ enum class CopyResult { Success, NoArtist, AlbumArtistAlreadyInPlace };
+ bool is_framelist_empty(const TagLib::ID3v2::FrameList &list)
+ {
+ for (auto it = list.begin(); it != list.end(); ++it)
+- if ((*it)->toString() != TagLib::String::null)
++ if (!(*it)->toString().isEmpty())
+ return false;
+ return true;
+ }
diff --git a/srcpkgs/ncmpcpp/patches/taglib2.patch b/srcpkgs/ncmpcpp/patches/taglib2.patch
new file mode 100644
index 00000000000000..fac6b0120231cb
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2.patch
@@ -0,0 +1,49 @@
+From dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Wed, 7 Feb 2024 14:28:26 +0100
+Subject: [PATCH] Fix compilation with taglib 2.0
+
+---
+ src/tags.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/tags.cpp b/src/tags.cpp
+index 6cd6a8c27..6395807ae 100644
+--- a/src/tags.cpp
++++ b/src/tags.cpp
+@@ -123,12 +123,12 @@ void writeCommonTags(const MPD::MutableSong &s, TagLib::Tag *tag)
+ tag->setArtist(ToWString(s.getArtist()));
+ tag->setAlbum(ToWString(s.getAlbum()));
+ try {
+- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate()));
++ tag->setYear(boost::lexical_cast<unsigned>(s.getDate()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+ try {
+- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack()));
++ tag->setTrack(boost::lexical_cast<unsigned>(s.getTrack()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+@@ -261,7 +261,7 @@ void read(mpd_song *s)
+ if (f.isNull())
+ return;
+
+- setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->length()));
++ setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->lengthInSeconds()));
+
+ if (auto mpeg_file = dynamic_cast<TagLib::MPEG::File *>(f.file()))
+ {
+@@ -306,7 +306,10 @@ bool write(MPD::MutableSong &s)
+ {
+ writeID3v2Tags(s, mpeg_file->ID3v2Tag(true));
+ // write id3v2.4 tags only
+- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))
++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2,
++ TagLib::File::StripOthers,
++ TagLib::ID3v2::v4,
++ TagLib::File::DoNotDuplicate))
+ return false;
+ // do not call generic save() as it will duplicate tags
+ saved = true;
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..02f26388eed645 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 257637755adc084f8e9e650f79fd2bbee1e850ac Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 39/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 34001c41ba3d6b0d22418dae43d98e3761cd8688 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 40/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 3 ++-
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 2 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83cd9380738800..f8918fe2a75667 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20250113
+version=0.1.20250227
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -821,6 +821,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 46ebbbac3df0044bf750cde72f5838e8beb98b33 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 41/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (34 preceding siblings ...)
2025-03-01 13:24 ` slymattz
@ 2025-03-02 11:53 ` slymattz
2025-03-02 11:53 ` slymattz
` (59 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-02 11:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/54493#issuecomment-2691478528
Comment:
So it turns out the builds for x86_64-{glibc,musl} complete fine. If I'm not mistaken, these errors could be ignored. Somebody correct me if I'm wrong.
id3ted-1.0_2: broken, unresolvable shlib `libtag.so.1'
Transaction aborted due to unresolved shlibs.
Failed to install 'taglib' and 'id3ted-1.0_2'
Error: Process completed with exit code 1.
```
^ permalink raw reply [flat|nested] 97+ messages in thread
* Re: taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (35 preceding siblings ...)
2025-03-02 11:53 ` slymattz
@ 2025-03-02 11:53 ` slymattz
2025-03-10 9:06 ` [PR PATCH] [Updated] " slymattz
` (58 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-02 11:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/54493#issuecomment-2691478528
Comment:
So it turns out the builds for x86_64-{glibc,musl} complete fine. If I'm not mistaken, these errors could be ignored. Somebody correct me if I'm wrong.
```
id3ted-1.0_2: broken, unresolvable shlib `libtag.so.1'
Transaction aborted due to unresolved shlibs.
Failed to install 'taglib' and 'id3ted-1.0_2'
Error: Process completed with exit code 1.
```
^ permalink raw reply [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (36 preceding siblings ...)
2025-03-02 11:53 ` slymattz
@ 2025-03-10 9:06 ` slymattz
2025-03-10 9:08 ` slymattz
` (57 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-10 9:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1781 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 76280 bytes --]
From 97bcd8c2731c491373a32acab5eeaced09a41339 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/37] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a6b26f6e9e9318..a65abe60d8dad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 0334455e49368f86703d280c62e486da633fb9f2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/37] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 84e94392efb143e08afc4eb1202be5c696fa55bc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/37] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From f9dd6915196629ad9f1822b498ae97855bba32e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/37] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 9c8ba70e764ddeaa09bc1363aac3d8dc64b0e395 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/37] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 22e01e716df28b6e850472cdd9dd6c09299c18aa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/37] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 55f94fb08b126dae7cad69fb43d827038e46152c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/37] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d84da2e623759716c96c0a22dc3f29c76845095d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/37] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From f546fa6eddae3e89e5286aeb72aaae9001ff434e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/37] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From dc15431a981b75f2a4c3b975c7891a7c081a3c2f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/37] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From fe7a51c35fc58fc3eb836dda5e6fe240247af03d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/37] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From 345033f61b983438b740e582f4bd0da36da4d84c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/37] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 49cfd50b86c777d215203ac27f791cbefdc63039 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/37] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 1cbc20b612435e32e2080d44021535c79259cfa0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/37] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 59d456d39306e5c0bf57bc1251dffde60062103b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/37] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 8ddb89903fefc8cdda58e2dc2ecc016aa4d88836 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 16/37] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 85e93c500f20d7067aed226c3751ba703c6ce010 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 17/37] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 7beee8d5102087d2151f3350cd1dd492580eacfb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 18/37] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 0eafdb8b8d5d81402dabcc1c7925805d3f763d53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 19/37] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From dae01a02ec5c33f49c40766c042bc7ec14bf6742 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 20/37] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 04fe3f3a1d5a603fb9a46faa50dbb7766019a4dd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 21/37] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From cd73c336705a22d83e1bc6e07ef8699dbf92bdd9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 22/37] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 75f5acdfbc678376927a7e8eb11a5a9fb93a3aa2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 23/37] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 96db28f6168202c49d14ad05e1c28144c3034d99 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 24/37] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 2ceadc9fca754ca8e4f92fc8fb5aca97b8d3039b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 25/37] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 27048d0a770e768a4c557b72a70bdd426b932afe Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 26/37] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From b7273154363e8f8f8f928151db1eb2a3fe93843b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 27/37] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From dccd53546d93ac7d2d6c7ba33fc2c52f556888fb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 28/37] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 70b4ef8c2843fb83cc91a61b863300b48bff4acc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 29/37] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From af4282f419a03b9282d11bf8cb43ccf4d1aa0613 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 30/37] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 3b6e2893a59ef00b1c77747e927e58bd74557520 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 31/37] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4aae2f7e587d91..5e2468d5526848 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 2833c1622ca0ab94199cd4f7be601a368a03b8d9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 32/37] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index a65abe60d8dad3..530ec8b42ada6d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5e2468d5526848..dbf26c186680b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From df94ab6115df945ac4acaa63a149cfa5823bced5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 33/37] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbf26c186680b6..506e88a230b759 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From af350aeb52e87090ec7144294dacc8518324947e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 34/37] ncmpcpp: revbump for libtag
---
srcpkgs/ncmpcpp/patches/taglib2-extras.patch | 22 +++++++++
srcpkgs/ncmpcpp/patches/taglib2.patch | 49 ++++++++++++++++++++
srcpkgs/ncmpcpp/template | 2 +-
3 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2-extras.patch
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2.patch
diff --git a/srcpkgs/ncmpcpp/patches/taglib2-extras.patch b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
new file mode 100644
index 00000000000000..8c362b68ad2c73
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
@@ -0,0 +1,22 @@
+From 81e5cf58b44be4ec0dc50722e2ed6d534df3973d Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Thu, 30 May 2024 14:58:09 +0200
+Subject: [PATCH] extras: fix compilation with taglib 2.0
+
+---
+ extras/artist_to_albumartist.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extras/artist_to_albumartist.cpp b/extras/artist_to_albumartist.cpp
+index c3ddfee3a..0349d0aed 100644
+--- a/extras/artist_to_albumartist.cpp
++++ b/extras/artist_to_albumartist.cpp
+@@ -34,7 +34,7 @@ enum class CopyResult { Success, NoArtist, AlbumArtistAlreadyInPlace };
+ bool is_framelist_empty(const TagLib::ID3v2::FrameList &list)
+ {
+ for (auto it = list.begin(); it != list.end(); ++it)
+- if ((*it)->toString() != TagLib::String::null)
++ if (!(*it)->toString().isEmpty())
+ return false;
+ return true;
+ }
diff --git a/srcpkgs/ncmpcpp/patches/taglib2.patch b/srcpkgs/ncmpcpp/patches/taglib2.patch
new file mode 100644
index 00000000000000..fac6b0120231cb
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2.patch
@@ -0,0 +1,49 @@
+From dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Wed, 7 Feb 2024 14:28:26 +0100
+Subject: [PATCH] Fix compilation with taglib 2.0
+
+---
+ src/tags.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/tags.cpp b/src/tags.cpp
+index 6cd6a8c27..6395807ae 100644
+--- a/src/tags.cpp
++++ b/src/tags.cpp
+@@ -123,12 +123,12 @@ void writeCommonTags(const MPD::MutableSong &s, TagLib::Tag *tag)
+ tag->setArtist(ToWString(s.getArtist()));
+ tag->setAlbum(ToWString(s.getAlbum()));
+ try {
+- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate()));
++ tag->setYear(boost::lexical_cast<unsigned>(s.getDate()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+ try {
+- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack()));
++ tag->setTrack(boost::lexical_cast<unsigned>(s.getTrack()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+@@ -261,7 +261,7 @@ void read(mpd_song *s)
+ if (f.isNull())
+ return;
+
+- setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->length()));
++ setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->lengthInSeconds()));
+
+ if (auto mpeg_file = dynamic_cast<TagLib::MPEG::File *>(f.file()))
+ {
+@@ -306,7 +306,10 @@ bool write(MPD::MutableSong &s)
+ {
+ writeID3v2Tags(s, mpeg_file->ID3v2Tag(true));
+ // write id3v2.4 tags only
+- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))
++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2,
++ TagLib::File::StripOthers,
++ TagLib::ID3v2::v4,
++ TagLib::File::DoNotDuplicate))
+ return false;
+ // do not call generic save() as it will duplicate tags
+ saved = true;
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..02f26388eed645 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 2d65bc6fd859cfbba918818bb33acd65bb1a0fb4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 35/37] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From acfeac05b8609eb9f54631b46d33458750d7fd9d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 36/37] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 3 ++-
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 2 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 506e88a230b759..bdac5d1096a756 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20250113
+version=0.1.20250227
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -823,6 +823,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 7ae401d0e48089440b3b3bf5afaf4ade81cab525 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 37/37] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (37 preceding siblings ...)
2025-03-10 9:06 ` [PR PATCH] [Updated] " slymattz
@ 2025-03-10 9:08 ` slymattz
2025-03-10 9:09 ` slymattz
` (56 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-10 9:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1781 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 76942 bytes --]
From 97bcd8c2731c491373a32acab5eeaced09a41339 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/38] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a6b26f6e9e9318..a65abe60d8dad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 0334455e49368f86703d280c62e486da633fb9f2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/38] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 84e94392efb143e08afc4eb1202be5c696fa55bc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/38] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From f9dd6915196629ad9f1822b498ae97855bba32e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/38] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 9c8ba70e764ddeaa09bc1363aac3d8dc64b0e395 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/38] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 22e01e716df28b6e850472cdd9dd6c09299c18aa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/38] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 55f94fb08b126dae7cad69fb43d827038e46152c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/38] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d84da2e623759716c96c0a22dc3f29c76845095d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/38] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From f546fa6eddae3e89e5286aeb72aaae9001ff434e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/38] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From dc15431a981b75f2a4c3b975c7891a7c081a3c2f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/38] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From fe7a51c35fc58fc3eb836dda5e6fe240247af03d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/38] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From 345033f61b983438b740e582f4bd0da36da4d84c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/38] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 49cfd50b86c777d215203ac27f791cbefdc63039 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/38] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 1cbc20b612435e32e2080d44021535c79259cfa0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/38] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 59d456d39306e5c0bf57bc1251dffde60062103b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/38] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 8ddb89903fefc8cdda58e2dc2ecc016aa4d88836 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 16/38] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 85e93c500f20d7067aed226c3751ba703c6ce010 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 17/38] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 7beee8d5102087d2151f3350cd1dd492580eacfb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 18/38] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 0eafdb8b8d5d81402dabcc1c7925805d3f763d53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 19/38] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From dae01a02ec5c33f49c40766c042bc7ec14bf6742 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 20/38] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 04fe3f3a1d5a603fb9a46faa50dbb7766019a4dd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 21/38] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From cd73c336705a22d83e1bc6e07ef8699dbf92bdd9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 22/38] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 75f5acdfbc678376927a7e8eb11a5a9fb93a3aa2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 23/38] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 96db28f6168202c49d14ad05e1c28144c3034d99 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 24/38] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 2ceadc9fca754ca8e4f92fc8fb5aca97b8d3039b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 25/38] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 27048d0a770e768a4c557b72a70bdd426b932afe Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 26/38] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From b7273154363e8f8f8f928151db1eb2a3fe93843b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 27/38] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From dccd53546d93ac7d2d6c7ba33fc2c52f556888fb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 28/38] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 70b4ef8c2843fb83cc91a61b863300b48bff4acc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 29/38] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From af4282f419a03b9282d11bf8cb43ccf4d1aa0613 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 30/38] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 3b6e2893a59ef00b1c77747e927e58bd74557520 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 31/38] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4aae2f7e587d91..5e2468d5526848 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 2833c1622ca0ab94199cd4f7be601a368a03b8d9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 32/38] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index a65abe60d8dad3..530ec8b42ada6d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5e2468d5526848..dbf26c186680b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From df94ab6115df945ac4acaa63a149cfa5823bced5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 33/38] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbf26c186680b6..506e88a230b759 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From af350aeb52e87090ec7144294dacc8518324947e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 34/38] ncmpcpp: revbump for libtag
---
srcpkgs/ncmpcpp/patches/taglib2-extras.patch | 22 +++++++++
srcpkgs/ncmpcpp/patches/taglib2.patch | 49 ++++++++++++++++++++
srcpkgs/ncmpcpp/template | 2 +-
3 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2-extras.patch
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2.patch
diff --git a/srcpkgs/ncmpcpp/patches/taglib2-extras.patch b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
new file mode 100644
index 00000000000000..8c362b68ad2c73
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
@@ -0,0 +1,22 @@
+From 81e5cf58b44be4ec0dc50722e2ed6d534df3973d Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Thu, 30 May 2024 14:58:09 +0200
+Subject: [PATCH] extras: fix compilation with taglib 2.0
+
+---
+ extras/artist_to_albumartist.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extras/artist_to_albumartist.cpp b/extras/artist_to_albumartist.cpp
+index c3ddfee3a..0349d0aed 100644
+--- a/extras/artist_to_albumartist.cpp
++++ b/extras/artist_to_albumartist.cpp
+@@ -34,7 +34,7 @@ enum class CopyResult { Success, NoArtist, AlbumArtistAlreadyInPlace };
+ bool is_framelist_empty(const TagLib::ID3v2::FrameList &list)
+ {
+ for (auto it = list.begin(); it != list.end(); ++it)
+- if ((*it)->toString() != TagLib::String::null)
++ if (!(*it)->toString().isEmpty())
+ return false;
+ return true;
+ }
diff --git a/srcpkgs/ncmpcpp/patches/taglib2.patch b/srcpkgs/ncmpcpp/patches/taglib2.patch
new file mode 100644
index 00000000000000..fac6b0120231cb
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2.patch
@@ -0,0 +1,49 @@
+From dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Wed, 7 Feb 2024 14:28:26 +0100
+Subject: [PATCH] Fix compilation with taglib 2.0
+
+---
+ src/tags.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/tags.cpp b/src/tags.cpp
+index 6cd6a8c27..6395807ae 100644
+--- a/src/tags.cpp
++++ b/src/tags.cpp
+@@ -123,12 +123,12 @@ void writeCommonTags(const MPD::MutableSong &s, TagLib::Tag *tag)
+ tag->setArtist(ToWString(s.getArtist()));
+ tag->setAlbum(ToWString(s.getAlbum()));
+ try {
+- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate()));
++ tag->setYear(boost::lexical_cast<unsigned>(s.getDate()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+ try {
+- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack()));
++ tag->setTrack(boost::lexical_cast<unsigned>(s.getTrack()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+@@ -261,7 +261,7 @@ void read(mpd_song *s)
+ if (f.isNull())
+ return;
+
+- setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->length()));
++ setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->lengthInSeconds()));
+
+ if (auto mpeg_file = dynamic_cast<TagLib::MPEG::File *>(f.file()))
+ {
+@@ -306,7 +306,10 @@ bool write(MPD::MutableSong &s)
+ {
+ writeID3v2Tags(s, mpeg_file->ID3v2Tag(true));
+ // write id3v2.4 tags only
+- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))
++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2,
++ TagLib::File::StripOthers,
++ TagLib::ID3v2::v4,
++ TagLib::File::DoNotDuplicate))
+ return false;
+ // do not call generic save() as it will duplicate tags
+ saved = true;
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..02f26388eed645 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 2d65bc6fd859cfbba918818bb33acd65bb1a0fb4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 35/38] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From acfeac05b8609eb9f54631b46d33458750d7fd9d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 36/38] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 3 ++-
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 2 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 506e88a230b759..bdac5d1096a756 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20250113
+version=0.1.20250227
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -823,6 +823,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 7ae401d0e48089440b3b3bf5afaf4ade81cab525 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 37/38] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From 043d7055ebf5e6a34d3db4c85951ae929593da33 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:08:19 +0100
Subject: [PATCH 38/38] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 95b79cc86e2e50..5985cafb6f3d56 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=2
+revision=3
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (38 preceding siblings ...)
2025-03-10 9:08 ` slymattz
@ 2025-03-10 9:09 ` slymattz
2025-03-10 9:10 ` slymattz
` (55 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-10 9:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1781 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 77671 bytes --]
From 97bcd8c2731c491373a32acab5eeaced09a41339 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/39] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a6b26f6e9e9318..a65abe60d8dad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 0334455e49368f86703d280c62e486da633fb9f2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/39] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 84e94392efb143e08afc4eb1202be5c696fa55bc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/39] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From f9dd6915196629ad9f1822b498ae97855bba32e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/39] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 9c8ba70e764ddeaa09bc1363aac3d8dc64b0e395 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/39] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 22e01e716df28b6e850472cdd9dd6c09299c18aa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/39] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 55f94fb08b126dae7cad69fb43d827038e46152c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/39] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d84da2e623759716c96c0a22dc3f29c76845095d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/39] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From f546fa6eddae3e89e5286aeb72aaae9001ff434e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/39] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From dc15431a981b75f2a4c3b975c7891a7c081a3c2f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/39] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From fe7a51c35fc58fc3eb836dda5e6fe240247af03d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/39] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From 345033f61b983438b740e582f4bd0da36da4d84c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/39] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 49cfd50b86c777d215203ac27f791cbefdc63039 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/39] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 1cbc20b612435e32e2080d44021535c79259cfa0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/39] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 59d456d39306e5c0bf57bc1251dffde60062103b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/39] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 8ddb89903fefc8cdda58e2dc2ecc016aa4d88836 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 16/39] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 85e93c500f20d7067aed226c3751ba703c6ce010 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 17/39] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 7beee8d5102087d2151f3350cd1dd492580eacfb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 18/39] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 0eafdb8b8d5d81402dabcc1c7925805d3f763d53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 19/39] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From dae01a02ec5c33f49c40766c042bc7ec14bf6742 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 20/39] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 04fe3f3a1d5a603fb9a46faa50dbb7766019a4dd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 21/39] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From cd73c336705a22d83e1bc6e07ef8699dbf92bdd9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 22/39] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 75f5acdfbc678376927a7e8eb11a5a9fb93a3aa2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 23/39] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 96db28f6168202c49d14ad05e1c28144c3034d99 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 24/39] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 2ceadc9fca754ca8e4f92fc8fb5aca97b8d3039b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 25/39] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 27048d0a770e768a4c557b72a70bdd426b932afe Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 26/39] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From b7273154363e8f8f8f928151db1eb2a3fe93843b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 27/39] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From dccd53546d93ac7d2d6c7ba33fc2c52f556888fb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 28/39] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 70b4ef8c2843fb83cc91a61b863300b48bff4acc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 29/39] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From af4282f419a03b9282d11bf8cb43ccf4d1aa0613 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 30/39] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 3b6e2893a59ef00b1c77747e927e58bd74557520 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 31/39] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4aae2f7e587d91..5e2468d5526848 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 2833c1622ca0ab94199cd4f7be601a368a03b8d9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 32/39] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index a65abe60d8dad3..530ec8b42ada6d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5e2468d5526848..dbf26c186680b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From df94ab6115df945ac4acaa63a149cfa5823bced5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 33/39] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbf26c186680b6..506e88a230b759 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From af350aeb52e87090ec7144294dacc8518324947e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 34/39] ncmpcpp: revbump for libtag
---
srcpkgs/ncmpcpp/patches/taglib2-extras.patch | 22 +++++++++
srcpkgs/ncmpcpp/patches/taglib2.patch | 49 ++++++++++++++++++++
srcpkgs/ncmpcpp/template | 2 +-
3 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2-extras.patch
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2.patch
diff --git a/srcpkgs/ncmpcpp/patches/taglib2-extras.patch b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
new file mode 100644
index 00000000000000..8c362b68ad2c73
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
@@ -0,0 +1,22 @@
+From 81e5cf58b44be4ec0dc50722e2ed6d534df3973d Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Thu, 30 May 2024 14:58:09 +0200
+Subject: [PATCH] extras: fix compilation with taglib 2.0
+
+---
+ extras/artist_to_albumartist.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extras/artist_to_albumartist.cpp b/extras/artist_to_albumartist.cpp
+index c3ddfee3a..0349d0aed 100644
+--- a/extras/artist_to_albumartist.cpp
++++ b/extras/artist_to_albumartist.cpp
+@@ -34,7 +34,7 @@ enum class CopyResult { Success, NoArtist, AlbumArtistAlreadyInPlace };
+ bool is_framelist_empty(const TagLib::ID3v2::FrameList &list)
+ {
+ for (auto it = list.begin(); it != list.end(); ++it)
+- if ((*it)->toString() != TagLib::String::null)
++ if (!(*it)->toString().isEmpty())
+ return false;
+ return true;
+ }
diff --git a/srcpkgs/ncmpcpp/patches/taglib2.patch b/srcpkgs/ncmpcpp/patches/taglib2.patch
new file mode 100644
index 00000000000000..fac6b0120231cb
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2.patch
@@ -0,0 +1,49 @@
+From dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Wed, 7 Feb 2024 14:28:26 +0100
+Subject: [PATCH] Fix compilation with taglib 2.0
+
+---
+ src/tags.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/tags.cpp b/src/tags.cpp
+index 6cd6a8c27..6395807ae 100644
+--- a/src/tags.cpp
++++ b/src/tags.cpp
+@@ -123,12 +123,12 @@ void writeCommonTags(const MPD::MutableSong &s, TagLib::Tag *tag)
+ tag->setArtist(ToWString(s.getArtist()));
+ tag->setAlbum(ToWString(s.getAlbum()));
+ try {
+- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate()));
++ tag->setYear(boost::lexical_cast<unsigned>(s.getDate()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+ try {
+- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack()));
++ tag->setTrack(boost::lexical_cast<unsigned>(s.getTrack()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+@@ -261,7 +261,7 @@ void read(mpd_song *s)
+ if (f.isNull())
+ return;
+
+- setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->length()));
++ setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->lengthInSeconds()));
+
+ if (auto mpeg_file = dynamic_cast<TagLib::MPEG::File *>(f.file()))
+ {
+@@ -306,7 +306,10 @@ bool write(MPD::MutableSong &s)
+ {
+ writeID3v2Tags(s, mpeg_file->ID3v2Tag(true));
+ // write id3v2.4 tags only
+- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))
++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2,
++ TagLib::File::StripOthers,
++ TagLib::ID3v2::v4,
++ TagLib::File::DoNotDuplicate))
+ return false;
+ // do not call generic save() as it will duplicate tags
+ saved = true;
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..02f26388eed645 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 2d65bc6fd859cfbba918818bb33acd65bb1a0fb4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 35/39] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From acfeac05b8609eb9f54631b46d33458750d7fd9d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 36/39] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 3 ++-
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 2 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 506e88a230b759..bdac5d1096a756 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20250113
+version=0.1.20250227
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -823,6 +823,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 7ae401d0e48089440b3b3bf5afaf4ade81cab525 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 37/39] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From 043d7055ebf5e6a34d3db4c85951ae929593da33 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:08:19 +0100
Subject: [PATCH 38/39] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 95b79cc86e2e50..5985cafb6f3d56 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=2
+revision=3
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 14960f757526c5c02caccc81786ee9b466008e96 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 39/39] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (39 preceding siblings ...)
2025-03-10 9:09 ` slymattz
@ 2025-03-10 9:10 ` slymattz
2025-03-10 9:10 ` slymattz
` (54 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-10 9:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1781 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 78359 bytes --]
From 97bcd8c2731c491373a32acab5eeaced09a41339 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/40] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a6b26f6e9e9318..a65abe60d8dad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 0334455e49368f86703d280c62e486da633fb9f2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/40] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 84e94392efb143e08afc4eb1202be5c696fa55bc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/40] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From f9dd6915196629ad9f1822b498ae97855bba32e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/40] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 9c8ba70e764ddeaa09bc1363aac3d8dc64b0e395 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/40] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 22e01e716df28b6e850472cdd9dd6c09299c18aa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/40] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 55f94fb08b126dae7cad69fb43d827038e46152c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/40] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d84da2e623759716c96c0a22dc3f29c76845095d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/40] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From f546fa6eddae3e89e5286aeb72aaae9001ff434e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/40] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From dc15431a981b75f2a4c3b975c7891a7c081a3c2f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/40] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From fe7a51c35fc58fc3eb836dda5e6fe240247af03d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/40] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From 345033f61b983438b740e582f4bd0da36da4d84c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/40] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 49cfd50b86c777d215203ac27f791cbefdc63039 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/40] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 1cbc20b612435e32e2080d44021535c79259cfa0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/40] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 59d456d39306e5c0bf57bc1251dffde60062103b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/40] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 8ddb89903fefc8cdda58e2dc2ecc016aa4d88836 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 16/40] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 85e93c500f20d7067aed226c3751ba703c6ce010 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 17/40] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 7beee8d5102087d2151f3350cd1dd492580eacfb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 18/40] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 0eafdb8b8d5d81402dabcc1c7925805d3f763d53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 19/40] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From dae01a02ec5c33f49c40766c042bc7ec14bf6742 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 20/40] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 04fe3f3a1d5a603fb9a46faa50dbb7766019a4dd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 21/40] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From cd73c336705a22d83e1bc6e07ef8699dbf92bdd9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 22/40] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 75f5acdfbc678376927a7e8eb11a5a9fb93a3aa2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 23/40] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 96db28f6168202c49d14ad05e1c28144c3034d99 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 24/40] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 2ceadc9fca754ca8e4f92fc8fb5aca97b8d3039b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 25/40] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 27048d0a770e768a4c557b72a70bdd426b932afe Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 26/40] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From b7273154363e8f8f8f928151db1eb2a3fe93843b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 27/40] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From dccd53546d93ac7d2d6c7ba33fc2c52f556888fb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 28/40] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 70b4ef8c2843fb83cc91a61b863300b48bff4acc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 29/40] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From af4282f419a03b9282d11bf8cb43ccf4d1aa0613 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 30/40] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 3b6e2893a59ef00b1c77747e927e58bd74557520 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 31/40] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4aae2f7e587d91..5e2468d5526848 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 2833c1622ca0ab94199cd4f7be601a368a03b8d9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 32/40] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index a65abe60d8dad3..530ec8b42ada6d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5e2468d5526848..dbf26c186680b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From df94ab6115df945ac4acaa63a149cfa5823bced5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 33/40] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbf26c186680b6..506e88a230b759 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From af350aeb52e87090ec7144294dacc8518324947e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 34/40] ncmpcpp: revbump for libtag
---
srcpkgs/ncmpcpp/patches/taglib2-extras.patch | 22 +++++++++
srcpkgs/ncmpcpp/patches/taglib2.patch | 49 ++++++++++++++++++++
srcpkgs/ncmpcpp/template | 2 +-
3 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2-extras.patch
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2.patch
diff --git a/srcpkgs/ncmpcpp/patches/taglib2-extras.patch b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
new file mode 100644
index 00000000000000..8c362b68ad2c73
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
@@ -0,0 +1,22 @@
+From 81e5cf58b44be4ec0dc50722e2ed6d534df3973d Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Thu, 30 May 2024 14:58:09 +0200
+Subject: [PATCH] extras: fix compilation with taglib 2.0
+
+---
+ extras/artist_to_albumartist.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extras/artist_to_albumartist.cpp b/extras/artist_to_albumartist.cpp
+index c3ddfee3a..0349d0aed 100644
+--- a/extras/artist_to_albumartist.cpp
++++ b/extras/artist_to_albumartist.cpp
+@@ -34,7 +34,7 @@ enum class CopyResult { Success, NoArtist, AlbumArtistAlreadyInPlace };
+ bool is_framelist_empty(const TagLib::ID3v2::FrameList &list)
+ {
+ for (auto it = list.begin(); it != list.end(); ++it)
+- if ((*it)->toString() != TagLib::String::null)
++ if (!(*it)->toString().isEmpty())
+ return false;
+ return true;
+ }
diff --git a/srcpkgs/ncmpcpp/patches/taglib2.patch b/srcpkgs/ncmpcpp/patches/taglib2.patch
new file mode 100644
index 00000000000000..fac6b0120231cb
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2.patch
@@ -0,0 +1,49 @@
+From dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Wed, 7 Feb 2024 14:28:26 +0100
+Subject: [PATCH] Fix compilation with taglib 2.0
+
+---
+ src/tags.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/tags.cpp b/src/tags.cpp
+index 6cd6a8c27..6395807ae 100644
+--- a/src/tags.cpp
++++ b/src/tags.cpp
+@@ -123,12 +123,12 @@ void writeCommonTags(const MPD::MutableSong &s, TagLib::Tag *tag)
+ tag->setArtist(ToWString(s.getArtist()));
+ tag->setAlbum(ToWString(s.getAlbum()));
+ try {
+- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate()));
++ tag->setYear(boost::lexical_cast<unsigned>(s.getDate()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+ try {
+- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack()));
++ tag->setTrack(boost::lexical_cast<unsigned>(s.getTrack()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+@@ -261,7 +261,7 @@ void read(mpd_song *s)
+ if (f.isNull())
+ return;
+
+- setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->length()));
++ setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->lengthInSeconds()));
+
+ if (auto mpeg_file = dynamic_cast<TagLib::MPEG::File *>(f.file()))
+ {
+@@ -306,7 +306,10 @@ bool write(MPD::MutableSong &s)
+ {
+ writeID3v2Tags(s, mpeg_file->ID3v2Tag(true));
+ // write id3v2.4 tags only
+- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))
++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2,
++ TagLib::File::StripOthers,
++ TagLib::ID3v2::v4,
++ TagLib::File::DoNotDuplicate))
+ return false;
+ // do not call generic save() as it will duplicate tags
+ saved = true;
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..02f26388eed645 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 2d65bc6fd859cfbba918818bb33acd65bb1a0fb4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 35/40] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From acfeac05b8609eb9f54631b46d33458750d7fd9d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 36/40] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 3 ++-
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 2 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 506e88a230b759..bdac5d1096a756 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20250113
+version=0.1.20250227
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -823,6 +823,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 7ae401d0e48089440b3b3bf5afaf4ade81cab525 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 37/40] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From 043d7055ebf5e6a34d3db4c85951ae929593da33 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:08:19 +0100
Subject: [PATCH 38/40] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 95b79cc86e2e50..5985cafb6f3d56 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=2
+revision=3
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 14960f757526c5c02caccc81786ee9b466008e96 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 39/40] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From e8097ecd24891805044a86814699d09f7b5ba2de Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 40/40] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (40 preceding siblings ...)
2025-03-10 9:10 ` slymattz
@ 2025-03-10 9:10 ` slymattz
2025-03-17 17:05 ` slymattz
` (53 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-10 9:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1781 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 79032 bytes --]
From 97bcd8c2731c491373a32acab5eeaced09a41339 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a6b26f6e9e9318..a65abe60d8dad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 0334455e49368f86703d280c62e486da633fb9f2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 84e94392efb143e08afc4eb1202be5c696fa55bc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From f9dd6915196629ad9f1822b498ae97855bba32e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 9c8ba70e764ddeaa09bc1363aac3d8dc64b0e395 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 22e01e716df28b6e850472cdd9dd6c09299c18aa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 55f94fb08b126dae7cad69fb43d827038e46152c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d84da2e623759716c96c0a22dc3f29c76845095d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From f546fa6eddae3e89e5286aeb72aaae9001ff434e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From dc15431a981b75f2a4c3b975c7891a7c081a3c2f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From fe7a51c35fc58fc3eb836dda5e6fe240247af03d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From 345033f61b983438b740e582f4bd0da36da4d84c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 49cfd50b86c777d215203ac27f791cbefdc63039 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 1cbc20b612435e32e2080d44021535c79259cfa0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 59d456d39306e5c0bf57bc1251dffde60062103b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 8ddb89903fefc8cdda58e2dc2ecc016aa4d88836 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 16/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 85e93c500f20d7067aed226c3751ba703c6ce010 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 17/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 7beee8d5102087d2151f3350cd1dd492580eacfb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 18/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 0eafdb8b8d5d81402dabcc1c7925805d3f763d53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 19/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From dae01a02ec5c33f49c40766c042bc7ec14bf6742 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 20/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 04fe3f3a1d5a603fb9a46faa50dbb7766019a4dd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 21/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From cd73c336705a22d83e1bc6e07ef8699dbf92bdd9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 22/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 75f5acdfbc678376927a7e8eb11a5a9fb93a3aa2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 23/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 96db28f6168202c49d14ad05e1c28144c3034d99 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 24/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 2ceadc9fca754ca8e4f92fc8fb5aca97b8d3039b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 25/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 27048d0a770e768a4c557b72a70bdd426b932afe Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 26/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From b7273154363e8f8f8f928151db1eb2a3fe93843b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 27/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From dccd53546d93ac7d2d6c7ba33fc2c52f556888fb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 28/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 70b4ef8c2843fb83cc91a61b863300b48bff4acc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 29/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From af4282f419a03b9282d11bf8cb43ccf4d1aa0613 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 30/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 3b6e2893a59ef00b1c77747e927e58bd74557520 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 31/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4aae2f7e587d91..5e2468d5526848 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 2833c1622ca0ab94199cd4f7be601a368a03b8d9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 32/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index a65abe60d8dad3..530ec8b42ada6d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5e2468d5526848..dbf26c186680b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From df94ab6115df945ac4acaa63a149cfa5823bced5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 33/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbf26c186680b6..506e88a230b759 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From af350aeb52e87090ec7144294dacc8518324947e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 34/41] ncmpcpp: revbump for libtag
---
srcpkgs/ncmpcpp/patches/taglib2-extras.patch | 22 +++++++++
srcpkgs/ncmpcpp/patches/taglib2.patch | 49 ++++++++++++++++++++
srcpkgs/ncmpcpp/template | 2 +-
3 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2-extras.patch
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2.patch
diff --git a/srcpkgs/ncmpcpp/patches/taglib2-extras.patch b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
new file mode 100644
index 00000000000000..8c362b68ad2c73
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
@@ -0,0 +1,22 @@
+From 81e5cf58b44be4ec0dc50722e2ed6d534df3973d Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Thu, 30 May 2024 14:58:09 +0200
+Subject: [PATCH] extras: fix compilation with taglib 2.0
+
+---
+ extras/artist_to_albumartist.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extras/artist_to_albumartist.cpp b/extras/artist_to_albumartist.cpp
+index c3ddfee3a..0349d0aed 100644
+--- a/extras/artist_to_albumartist.cpp
++++ b/extras/artist_to_albumartist.cpp
+@@ -34,7 +34,7 @@ enum class CopyResult { Success, NoArtist, AlbumArtistAlreadyInPlace };
+ bool is_framelist_empty(const TagLib::ID3v2::FrameList &list)
+ {
+ for (auto it = list.begin(); it != list.end(); ++it)
+- if ((*it)->toString() != TagLib::String::null)
++ if (!(*it)->toString().isEmpty())
+ return false;
+ return true;
+ }
diff --git a/srcpkgs/ncmpcpp/patches/taglib2.patch b/srcpkgs/ncmpcpp/patches/taglib2.patch
new file mode 100644
index 00000000000000..fac6b0120231cb
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2.patch
@@ -0,0 +1,49 @@
+From dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Wed, 7 Feb 2024 14:28:26 +0100
+Subject: [PATCH] Fix compilation with taglib 2.0
+
+---
+ src/tags.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/tags.cpp b/src/tags.cpp
+index 6cd6a8c27..6395807ae 100644
+--- a/src/tags.cpp
++++ b/src/tags.cpp
+@@ -123,12 +123,12 @@ void writeCommonTags(const MPD::MutableSong &s, TagLib::Tag *tag)
+ tag->setArtist(ToWString(s.getArtist()));
+ tag->setAlbum(ToWString(s.getAlbum()));
+ try {
+- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate()));
++ tag->setYear(boost::lexical_cast<unsigned>(s.getDate()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+ try {
+- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack()));
++ tag->setTrack(boost::lexical_cast<unsigned>(s.getTrack()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+@@ -261,7 +261,7 @@ void read(mpd_song *s)
+ if (f.isNull())
+ return;
+
+- setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->length()));
++ setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->lengthInSeconds()));
+
+ if (auto mpeg_file = dynamic_cast<TagLib::MPEG::File *>(f.file()))
+ {
+@@ -306,7 +306,10 @@ bool write(MPD::MutableSong &s)
+ {
+ writeID3v2Tags(s, mpeg_file->ID3v2Tag(true));
+ // write id3v2.4 tags only
+- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))
++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2,
++ TagLib::File::StripOthers,
++ TagLib::ID3v2::v4,
++ TagLib::File::DoNotDuplicate))
+ return false;
+ // do not call generic save() as it will duplicate tags
+ saved = true;
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..02f26388eed645 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 2d65bc6fd859cfbba918818bb33acd65bb1a0fb4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 35/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From acfeac05b8609eb9f54631b46d33458750d7fd9d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 36/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 3 ++-
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 2 insertions(+), 21 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 506e88a230b759..bdac5d1096a756 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20250113
+version=0.1.20250227
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -823,6 +823,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 7ae401d0e48089440b3b3bf5afaf4ade81cab525 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 37/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From 043d7055ebf5e6a34d3db4c85951ae929593da33 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:08:19 +0100
Subject: [PATCH 38/41] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 95b79cc86e2e50..5985cafb6f3d56 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=2
+revision=3
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 14960f757526c5c02caccc81786ee9b466008e96 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 39/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From e8097ecd24891805044a86814699d09f7b5ba2de Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 40/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From c3961a1d6907bbfc18cdb3e6a4abeebb0dfadbbc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 41/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (41 preceding siblings ...)
2025-03-10 9:10 ` slymattz
@ 2025-03-17 17:05 ` slymattz
2025-03-17 17:10 ` slymattz
` (52 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-17 17:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2032 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 78815 bytes --]
From 97bcd8c2731c491373a32acab5eeaced09a41339 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a6b26f6e9e9318..a65abe60d8dad3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 0334455e49368f86703d280c62e486da633fb9f2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 84e94392efb143e08afc4eb1202be5c696fa55bc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From f9dd6915196629ad9f1822b498ae97855bba32e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 9c8ba70e764ddeaa09bc1363aac3d8dc64b0e395 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 22e01e716df28b6e850472cdd9dd6c09299c18aa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 55f94fb08b126dae7cad69fb43d827038e46152c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From d84da2e623759716c96c0a22dc3f29c76845095d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From f546fa6eddae3e89e5286aeb72aaae9001ff434e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From dc15431a981b75f2a4c3b975c7891a7c081a3c2f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From fe7a51c35fc58fc3eb836dda5e6fe240247af03d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From 345033f61b983438b740e582f4bd0da36da4d84c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 49cfd50b86c777d215203ac27f791cbefdc63039 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 1cbc20b612435e32e2080d44021535c79259cfa0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 59d456d39306e5c0bf57bc1251dffde60062103b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 8ddb89903fefc8cdda58e2dc2ecc016aa4d88836 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:57:23 +0100
Subject: [PATCH 16/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index ecfa4a05bc3854..0dca3d840b62b2 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.11.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 85e93c500f20d7067aed226c3751ba703c6ce010 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 17/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 7beee8d5102087d2151f3350cd1dd492580eacfb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 18/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 0eafdb8b8d5d81402dabcc1c7925805d3f763d53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 19/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From dae01a02ec5c33f49c40766c042bc7ec14bf6742 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 20/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 04fe3f3a1d5a603fb9a46faa50dbb7766019a4dd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 21/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From cd73c336705a22d83e1bc6e07ef8699dbf92bdd9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 22/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 75f5acdfbc678376927a7e8eb11a5a9fb93a3aa2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 23/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 96db28f6168202c49d14ad05e1c28144c3034d99 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 24/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 2ceadc9fca754ca8e4f92fc8fb5aca97b8d3039b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 25/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 27048d0a770e768a4c557b72a70bdd426b932afe Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 26/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From b7273154363e8f8f8f928151db1eb2a3fe93843b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 27/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From dccd53546d93ac7d2d6c7ba33fc2c52f556888fb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 28/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 70b4ef8c2843fb83cc91a61b863300b48bff4acc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 29/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From af4282f419a03b9282d11bf8cb43ccf4d1aa0613 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 30/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 3b6e2893a59ef00b1c77747e927e58bd74557520 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 31/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4aae2f7e587d91..5e2468d5526848 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 2833c1622ca0ab94199cd4f7be601a368a03b8d9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 32/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index a65abe60d8dad3..530ec8b42ada6d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5e2468d5526848..dbf26c186680b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From df94ab6115df945ac4acaa63a149cfa5823bced5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 33/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbf26c186680b6..506e88a230b759 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From af350aeb52e87090ec7144294dacc8518324947e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 34/41] ncmpcpp: revbump for libtag
---
srcpkgs/ncmpcpp/patches/taglib2-extras.patch | 22 +++++++++
srcpkgs/ncmpcpp/patches/taglib2.patch | 49 ++++++++++++++++++++
srcpkgs/ncmpcpp/template | 2 +-
3 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2-extras.patch
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2.patch
diff --git a/srcpkgs/ncmpcpp/patches/taglib2-extras.patch b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
new file mode 100644
index 00000000000000..8c362b68ad2c73
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
@@ -0,0 +1,22 @@
+From 81e5cf58b44be4ec0dc50722e2ed6d534df3973d Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Thu, 30 May 2024 14:58:09 +0200
+Subject: [PATCH] extras: fix compilation with taglib 2.0
+
+---
+ extras/artist_to_albumartist.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extras/artist_to_albumartist.cpp b/extras/artist_to_albumartist.cpp
+index c3ddfee3a..0349d0aed 100644
+--- a/extras/artist_to_albumartist.cpp
++++ b/extras/artist_to_albumartist.cpp
+@@ -34,7 +34,7 @@ enum class CopyResult { Success, NoArtist, AlbumArtistAlreadyInPlace };
+ bool is_framelist_empty(const TagLib::ID3v2::FrameList &list)
+ {
+ for (auto it = list.begin(); it != list.end(); ++it)
+- if ((*it)->toString() != TagLib::String::null)
++ if (!(*it)->toString().isEmpty())
+ return false;
+ return true;
+ }
diff --git a/srcpkgs/ncmpcpp/patches/taglib2.patch b/srcpkgs/ncmpcpp/patches/taglib2.patch
new file mode 100644
index 00000000000000..fac6b0120231cb
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2.patch
@@ -0,0 +1,49 @@
+From dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Wed, 7 Feb 2024 14:28:26 +0100
+Subject: [PATCH] Fix compilation with taglib 2.0
+
+---
+ src/tags.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/tags.cpp b/src/tags.cpp
+index 6cd6a8c27..6395807ae 100644
+--- a/src/tags.cpp
++++ b/src/tags.cpp
+@@ -123,12 +123,12 @@ void writeCommonTags(const MPD::MutableSong &s, TagLib::Tag *tag)
+ tag->setArtist(ToWString(s.getArtist()));
+ tag->setAlbum(ToWString(s.getAlbum()));
+ try {
+- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate()));
++ tag->setYear(boost::lexical_cast<unsigned>(s.getDate()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+ try {
+- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack()));
++ tag->setTrack(boost::lexical_cast<unsigned>(s.getTrack()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+@@ -261,7 +261,7 @@ void read(mpd_song *s)
+ if (f.isNull())
+ return;
+
+- setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->length()));
++ setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->lengthInSeconds()));
+
+ if (auto mpeg_file = dynamic_cast<TagLib::MPEG::File *>(f.file()))
+ {
+@@ -306,7 +306,10 @@ bool write(MPD::MutableSong &s)
+ {
+ writeID3v2Tags(s, mpeg_file->ID3v2Tag(true));
+ // write id3v2.4 tags only
+- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))
++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2,
++ TagLib::File::StripOthers,
++ TagLib::ID3v2::v4,
++ TagLib::File::DoNotDuplicate))
+ return false;
+ // do not call generic save() as it will duplicate tags
+ saved = true;
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..02f26388eed645 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 2d65bc6fd859cfbba918818bb33acd65bb1a0fb4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 35/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 31ffaf0d443ecbc767ccfaf0aa003fed2516903b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 36/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 1 +
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 506e88a230b759..e24fc5cd9b0eaf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -823,6 +823,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From d097ccdd570859e3548880b1e32f23697bdeb9bf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 37/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From 8171360b7fb738c43efa68dde01e75d5bbef35c8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:08:19 +0100
Subject: [PATCH 38/41] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 95b79cc86e2e50..5985cafb6f3d56 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=2
+revision=3
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 09cf06ee599f020d27cfc7e34c77b9444ad44ca4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 39/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 1a470b60dc66fca70db5ec4876cd4dbcde33c810 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 40/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From fab6ff007bc129ce392645fa6914d88b1511c0f7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 41/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (42 preceding siblings ...)
2025-03-17 17:05 ` slymattz
@ 2025-03-17 17:10 ` slymattz
2025-03-18 11:12 ` slymattz
` (51 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-17 17:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2017 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 78815 bytes --]
From cf0d8d0b50f10aa464ded9de7484f74c36be6581 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 640e3b2b665f51..8a899097430d77 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 52af5fe21afe00715f51ff3751e756ec5ea9d809 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 2d9c5e673e6f1a544a51f0ea76f77a55edde926a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From a65455b8692bba49544aa3850c1888475bfea46f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 125d8620efa00363f926730608a225d471359c99 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 9ae1b59dd314c4dea1ac48c75f4ad0dca97df969 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From acc9f9796e18fa7167fb825b054c2c49cf23b315 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 9b4cab9947a1bd3d2c89468c9779b9f8a8812b49 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From a9e0658d127245f116ca7b5431c3e12001bd8dc9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From 9ce09e2027ec757c7bed81e2e34df735256ea2b0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 290c2006b599b66cf2a29d3eb8f6babfce58f9ac Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From b3c7e0a55db393300750027af3ae7825e3a14445 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 8286b46696e8ca47718380ed612072a9971d33fc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From ac388e40f5e4bdee5dd08d65c2b151f657844ce1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From c027371471aa90bbae22d8807c39595f6138c38b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From c93d41b4a90317768ad8c729e506b5b80ac89600 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 16/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 4b27571cf47b45a0b74035ff7168a4bf099370d9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 17/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch | 70 +++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
diff --git a/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
new file mode 100644
index 00000000000000..0232799950f16e
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-3.0.21-taglib-1.patch
@@ -0,0 +1,70 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2024-02-17
+Initial Package Version: 3.0.20
+Upstream Status: Unknown
+Origin: Arch Linux
+Description: Fixes compilation with taglib-2.0
+
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c795..f371485008 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From f26620768ad23c6743d94f9772234d92612b8bb0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 18/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From f1a10a280ec02c985c5d76127a3decbc74190466 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 19/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 1121a5d906a96eaffc3f224998bec4821044dbb4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 20/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 23acebe02a92c5fc53461c857d30560b4b7628d8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 21/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From e044bf57bccebf41e71c3e71c40bbea4c0903175 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 22/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From b2b7e7e157d872fe4a09942a173362bdb12fa576 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 23/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 9b77ce70d33e1b8b6dc383bd6f4a212f3e529694 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 24/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From be3e259d812b8c6c5750160b974aeed34591ff08 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 25/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From 4d351112894bb3dc5e468592573643b889e77fdd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 26/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 6d8d0d9f04aaccae6b2c592bf6d120a0ec7d1081 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 27/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From d157b00446a0239cb52fdd87fa63f58536d77845 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 28/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From 1d6d75afe3f1a129a210fc627e70f74283a695c6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 29/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 7e16997f57edd69af65e1a1576cd62e6a9ea803f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 30/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4aae2f7e587d91..5e2468d5526848 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From fa01ab7598051ec0ac124d5c2f7724f282fa67cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 31/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 8a899097430d77..d3e6a55af15de3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5e2468d5526848..dbf26c186680b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From 0446a8027a2b3fe45d8eedaa2c57fcb430c5c639 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 32/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbf26c186680b6..506e88a230b759 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 229660b72d5bfb92ffc2f4991ea8d4367b64ada6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 33/41] ncmpcpp: revbump for libtag
---
srcpkgs/ncmpcpp/patches/taglib2-extras.patch | 22 +++++++++
srcpkgs/ncmpcpp/patches/taglib2.patch | 49 ++++++++++++++++++++
srcpkgs/ncmpcpp/template | 2 +-
3 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2-extras.patch
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2.patch
diff --git a/srcpkgs/ncmpcpp/patches/taglib2-extras.patch b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
new file mode 100644
index 00000000000000..8c362b68ad2c73
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
@@ -0,0 +1,22 @@
+From 81e5cf58b44be4ec0dc50722e2ed6d534df3973d Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Thu, 30 May 2024 14:58:09 +0200
+Subject: [PATCH] extras: fix compilation with taglib 2.0
+
+---
+ extras/artist_to_albumartist.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extras/artist_to_albumartist.cpp b/extras/artist_to_albumartist.cpp
+index c3ddfee3a..0349d0aed 100644
+--- a/extras/artist_to_albumartist.cpp
++++ b/extras/artist_to_albumartist.cpp
+@@ -34,7 +34,7 @@ enum class CopyResult { Success, NoArtist, AlbumArtistAlreadyInPlace };
+ bool is_framelist_empty(const TagLib::ID3v2::FrameList &list)
+ {
+ for (auto it = list.begin(); it != list.end(); ++it)
+- if ((*it)->toString() != TagLib::String::null)
++ if (!(*it)->toString().isEmpty())
+ return false;
+ return true;
+ }
diff --git a/srcpkgs/ncmpcpp/patches/taglib2.patch b/srcpkgs/ncmpcpp/patches/taglib2.patch
new file mode 100644
index 00000000000000..fac6b0120231cb
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2.patch
@@ -0,0 +1,49 @@
+From dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Wed, 7 Feb 2024 14:28:26 +0100
+Subject: [PATCH] Fix compilation with taglib 2.0
+
+---
+ src/tags.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/tags.cpp b/src/tags.cpp
+index 6cd6a8c27..6395807ae 100644
+--- a/src/tags.cpp
++++ b/src/tags.cpp
+@@ -123,12 +123,12 @@ void writeCommonTags(const MPD::MutableSong &s, TagLib::Tag *tag)
+ tag->setArtist(ToWString(s.getArtist()));
+ tag->setAlbum(ToWString(s.getAlbum()));
+ try {
+- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate()));
++ tag->setYear(boost::lexical_cast<unsigned>(s.getDate()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+ try {
+- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack()));
++ tag->setTrack(boost::lexical_cast<unsigned>(s.getTrack()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+@@ -261,7 +261,7 @@ void read(mpd_song *s)
+ if (f.isNull())
+ return;
+
+- setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->length()));
++ setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->lengthInSeconds()));
+
+ if (auto mpeg_file = dynamic_cast<TagLib::MPEG::File *>(f.file()))
+ {
+@@ -306,7 +306,10 @@ bool write(MPD::MutableSong &s)
+ {
+ writeID3v2Tags(s, mpeg_file->ID3v2Tag(true));
+ // write id3v2.4 tags only
+- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))
++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2,
++ TagLib::File::StripOthers,
++ TagLib::ID3v2::v4,
++ TagLib::File::DoNotDuplicate))
+ return false;
+ // do not call generic save() as it will duplicate tags
+ saved = true;
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..02f26388eed645 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From a509acd580df2d4ff036dc417c6356790cab9cd3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 34/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From f0821cf6c5ef725e492c6322be25c1908d196260 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 35/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 1 +
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 506e88a230b759..e24fc5cd9b0eaf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -823,6 +823,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 2c97ac7d4c92a789b3727df10f9f8fabb04c829a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 36/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From acc9147c7a6390d8556aec586707baec5389dfbb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:08:19 +0100
Subject: [PATCH 37/41] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 95b79cc86e2e50..5985cafb6f3d56 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=2
+revision=3
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 8d684d00c431d8003ed12a218f9bc800420023f7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 38/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 0eb40a2104ee3c4c9da993fd7faf7e8e09bdfb57 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 39/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 286a6874f80e84e29a961df3fa328bf4972b290d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 40/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From b57c576a7ca1a5345232d91b1fdcfe9fee22e4c9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 41/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (43 preceding siblings ...)
2025-03-17 17:10 ` slymattz
@ 2025-03-18 11:12 ` slymattz
2025-03-18 20:30 ` slymattz
` (50 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-18 11:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2017 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 79313 bytes --]
From cf0d8d0b50f10aa464ded9de7484f74c36be6581 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 640e3b2b665f51..8a899097430d77 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 52af5fe21afe00715f51ff3751e756ec5ea9d809 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 2d9c5e673e6f1a544a51f0ea76f77a55edde926a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From a65455b8692bba49544aa3850c1888475bfea46f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 125d8620efa00363f926730608a225d471359c99 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 9ae1b59dd314c4dea1ac48c75f4ad0dca97df969 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From acc9f9796e18fa7167fb825b054c2c49cf23b315 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 9b4cab9947a1bd3d2c89468c9779b9f8a8812b49 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From a9e0658d127245f116ca7b5431c3e12001bd8dc9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From 9ce09e2027ec757c7bed81e2e34df735256ea2b0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 290c2006b599b66cf2a29d3eb8f6babfce58f9ac Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From b3c7e0a55db393300750027af3ae7825e3a14445 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 8286b46696e8ca47718380ed612072a9971d33fc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From ac388e40f5e4bdee5dd08d65c2b151f657844ce1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From c027371471aa90bbae22d8807c39595f6138c38b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From c93d41b4a90317768ad8c729e506b5b80ac89600 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 16/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 3cb28f09fdf3d14af5e7000e3014732fc2c54cd2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 17/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 138fc6c9f72b09618adb8bae3ac6764d1f9ed2a9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 18/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From e663d7c22240d9740361a6df39610ec2517779f9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 19/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 81eeca491b4151521b2f1586bdc59ccb76a7d5ae Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 20/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From c0824823cdd2f7561a0e2741ce4dc0ca4f4d4640 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 21/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From ba92754bee0b373b61f9c32a3a1a45140bd381de Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 22/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 5bf10bc4431649cc4d0ca018af1c35d15430cefd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 23/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 12b31f02d3704d607983b288939374a0b12306a2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 24/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From f54f8fc63b3b5ed297d2771dacaa0f4c1c8b9de9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 25/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From 8cf2aae9e83b92e83882461f3e1a4fa6f168da8d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 26/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 07998e8e0fdfdc45ca89dee0734f3ee5c3a1dca1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 27/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From f19aed63e7ccf3f4adbb7a3deb8da8ea7fe7077b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 28/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From fc9e5e0e91ed3905a27bdb4c017775e590ed53fb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 29/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 874af069074113c1c58026dc1e8f2b96fed13370 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 30/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4aae2f7e587d91..5e2468d5526848 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 0b95f3639534c77b38b7950a0b94694fc47325cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 31/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 8a899097430d77..d3e6a55af15de3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5e2468d5526848..dbf26c186680b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From 35e00f153462dc5e2c5f4823c46b255faaa401d7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 32/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbf26c186680b6..506e88a230b759 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 8fef97e12a12123d2c25f222f05b90ecd9173e07 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 33/41] ncmpcpp: revbump for libtag
---
srcpkgs/ncmpcpp/patches/taglib2-extras.patch | 22 +++++++++
srcpkgs/ncmpcpp/patches/taglib2.patch | 49 ++++++++++++++++++++
srcpkgs/ncmpcpp/template | 2 +-
3 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2-extras.patch
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2.patch
diff --git a/srcpkgs/ncmpcpp/patches/taglib2-extras.patch b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
new file mode 100644
index 00000000000000..8c362b68ad2c73
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
@@ -0,0 +1,22 @@
+From 81e5cf58b44be4ec0dc50722e2ed6d534df3973d Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Thu, 30 May 2024 14:58:09 +0200
+Subject: [PATCH] extras: fix compilation with taglib 2.0
+
+---
+ extras/artist_to_albumartist.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extras/artist_to_albumartist.cpp b/extras/artist_to_albumartist.cpp
+index c3ddfee3a..0349d0aed 100644
+--- a/extras/artist_to_albumartist.cpp
++++ b/extras/artist_to_albumartist.cpp
+@@ -34,7 +34,7 @@ enum class CopyResult { Success, NoArtist, AlbumArtistAlreadyInPlace };
+ bool is_framelist_empty(const TagLib::ID3v2::FrameList &list)
+ {
+ for (auto it = list.begin(); it != list.end(); ++it)
+- if ((*it)->toString() != TagLib::String::null)
++ if (!(*it)->toString().isEmpty())
+ return false;
+ return true;
+ }
diff --git a/srcpkgs/ncmpcpp/patches/taglib2.patch b/srcpkgs/ncmpcpp/patches/taglib2.patch
new file mode 100644
index 00000000000000..fac6b0120231cb
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2.patch
@@ -0,0 +1,49 @@
+From dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Wed, 7 Feb 2024 14:28:26 +0100
+Subject: [PATCH] Fix compilation with taglib 2.0
+
+---
+ src/tags.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/tags.cpp b/src/tags.cpp
+index 6cd6a8c27..6395807ae 100644
+--- a/src/tags.cpp
++++ b/src/tags.cpp
+@@ -123,12 +123,12 @@ void writeCommonTags(const MPD::MutableSong &s, TagLib::Tag *tag)
+ tag->setArtist(ToWString(s.getArtist()));
+ tag->setAlbum(ToWString(s.getAlbum()));
+ try {
+- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate()));
++ tag->setYear(boost::lexical_cast<unsigned>(s.getDate()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+ try {
+- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack()));
++ tag->setTrack(boost::lexical_cast<unsigned>(s.getTrack()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+@@ -261,7 +261,7 @@ void read(mpd_song *s)
+ if (f.isNull())
+ return;
+
+- setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->length()));
++ setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->lengthInSeconds()));
+
+ if (auto mpeg_file = dynamic_cast<TagLib::MPEG::File *>(f.file()))
+ {
+@@ -306,7 +306,10 @@ bool write(MPD::MutableSong &s)
+ {
+ writeID3v2Tags(s, mpeg_file->ID3v2Tag(true));
+ // write id3v2.4 tags only
+- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))
++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2,
++ TagLib::File::StripOthers,
++ TagLib::ID3v2::v4,
++ TagLib::File::DoNotDuplicate))
+ return false;
+ // do not call generic save() as it will duplicate tags
+ saved = true;
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..02f26388eed645 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 930b683330a0e7c218235752c74188a37936f398 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 34/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 1b8ebcd5135b37a4f4d3abe8357deb4bbb4608a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 35/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 1 +
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 506e88a230b759..e24fc5cd9b0eaf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -823,6 +823,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 578a48f617b948b16cfc0b87efb8f6942e723d09 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 36/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From c6d284995b38e340ff1bb5ea3b85f9e97384c5e6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:08:19 +0100
Subject: [PATCH 37/41] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 95b79cc86e2e50..5985cafb6f3d56 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=2
+revision=3
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 402003a04a6ca58e94d3847dd1ddf797f58f563a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 38/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From e2cf3ecd3364db82938f96438084ca5aff577c3a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 39/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 14ed8543d5465e80d6237cb4c69a68fc8debaac3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 40/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 0e9944a20eff0df30d23fbf2e6cf131ff44788bd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 41/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (44 preceding siblings ...)
2025-03-18 11:12 ` slymattz
@ 2025-03-18 20:30 ` slymattz
2025-03-19 13:42 ` slymattz
` (49 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-18 20:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2017 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 79313 bytes --]
From cf0d8d0b50f10aa464ded9de7484f74c36be6581 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 640e3b2b665f51..8a899097430d77 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 52af5fe21afe00715f51ff3751e756ec5ea9d809 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 2d9c5e673e6f1a544a51f0ea76f77a55edde926a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From a65455b8692bba49544aa3850c1888475bfea46f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 125d8620efa00363f926730608a225d471359c99 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 9ae1b59dd314c4dea1ac48c75f4ad0dca97df969 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From acc9f9796e18fa7167fb825b054c2c49cf23b315 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 9b4cab9947a1bd3d2c89468c9779b9f8a8812b49 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From a9e0658d127245f116ca7b5431c3e12001bd8dc9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From 9ce09e2027ec757c7bed81e2e34df735256ea2b0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 290c2006b599b66cf2a29d3eb8f6babfce58f9ac Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From b3c7e0a55db393300750027af3ae7825e3a14445 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 8286b46696e8ca47718380ed612072a9971d33fc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From ac388e40f5e4bdee5dd08d65c2b151f657844ce1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From c027371471aa90bbae22d8807c39595f6138c38b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From c93d41b4a90317768ad8c729e506b5b80ac89600 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 16/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 3cb28f09fdf3d14af5e7000e3014732fc2c54cd2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 17/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 138fc6c9f72b09618adb8bae3ac6764d1f9ed2a9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 18/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From e663d7c22240d9740361a6df39610ec2517779f9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 19/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 81eeca491b4151521b2f1586bdc59ccb76a7d5ae Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 20/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From c0824823cdd2f7561a0e2741ce4dc0ca4f4d4640 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 21/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From ba92754bee0b373b61f9c32a3a1a45140bd381de Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 22/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 5bf10bc4431649cc4d0ca018af1c35d15430cefd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 23/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 12b31f02d3704d607983b288939374a0b12306a2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 24/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From f54f8fc63b3b5ed297d2771dacaa0f4c1c8b9de9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 25/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From 8cf2aae9e83b92e83882461f3e1a4fa6f168da8d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 26/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 07998e8e0fdfdc45ca89dee0734f3ee5c3a1dca1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 27/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From f19aed63e7ccf3f4adbb7a3deb8da8ea7fe7077b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 28/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From fc9e5e0e91ed3905a27bdb4c017775e590ed53fb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 29/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 874af069074113c1c58026dc1e8f2b96fed13370 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 30/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4aae2f7e587d91..5e2468d5526848 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 0b95f3639534c77b38b7950a0b94694fc47325cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 31/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 8a899097430d77..d3e6a55af15de3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5e2468d5526848..dbf26c186680b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From 35e00f153462dc5e2c5f4823c46b255faaa401d7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 32/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbf26c186680b6..506e88a230b759 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 8fef97e12a12123d2c25f222f05b90ecd9173e07 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 33/41] ncmpcpp: revbump for libtag
---
srcpkgs/ncmpcpp/patches/taglib2-extras.patch | 22 +++++++++
srcpkgs/ncmpcpp/patches/taglib2.patch | 49 ++++++++++++++++++++
srcpkgs/ncmpcpp/template | 2 +-
3 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2-extras.patch
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2.patch
diff --git a/srcpkgs/ncmpcpp/patches/taglib2-extras.patch b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
new file mode 100644
index 00000000000000..8c362b68ad2c73
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
@@ -0,0 +1,22 @@
+From 81e5cf58b44be4ec0dc50722e2ed6d534df3973d Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Thu, 30 May 2024 14:58:09 +0200
+Subject: [PATCH] extras: fix compilation with taglib 2.0
+
+---
+ extras/artist_to_albumartist.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extras/artist_to_albumartist.cpp b/extras/artist_to_albumartist.cpp
+index c3ddfee3a..0349d0aed 100644
+--- a/extras/artist_to_albumartist.cpp
++++ b/extras/artist_to_albumartist.cpp
+@@ -34,7 +34,7 @@ enum class CopyResult { Success, NoArtist, AlbumArtistAlreadyInPlace };
+ bool is_framelist_empty(const TagLib::ID3v2::FrameList &list)
+ {
+ for (auto it = list.begin(); it != list.end(); ++it)
+- if ((*it)->toString() != TagLib::String::null)
++ if (!(*it)->toString().isEmpty())
+ return false;
+ return true;
+ }
diff --git a/srcpkgs/ncmpcpp/patches/taglib2.patch b/srcpkgs/ncmpcpp/patches/taglib2.patch
new file mode 100644
index 00000000000000..fac6b0120231cb
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2.patch
@@ -0,0 +1,49 @@
+From dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Wed, 7 Feb 2024 14:28:26 +0100
+Subject: [PATCH] Fix compilation with taglib 2.0
+
+---
+ src/tags.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/tags.cpp b/src/tags.cpp
+index 6cd6a8c27..6395807ae 100644
+--- a/src/tags.cpp
++++ b/src/tags.cpp
+@@ -123,12 +123,12 @@ void writeCommonTags(const MPD::MutableSong &s, TagLib::Tag *tag)
+ tag->setArtist(ToWString(s.getArtist()));
+ tag->setAlbum(ToWString(s.getAlbum()));
+ try {
+- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate()));
++ tag->setYear(boost::lexical_cast<unsigned>(s.getDate()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+ try {
+- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack()));
++ tag->setTrack(boost::lexical_cast<unsigned>(s.getTrack()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+@@ -261,7 +261,7 @@ void read(mpd_song *s)
+ if (f.isNull())
+ return;
+
+- setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->length()));
++ setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->lengthInSeconds()));
+
+ if (auto mpeg_file = dynamic_cast<TagLib::MPEG::File *>(f.file()))
+ {
+@@ -306,7 +306,10 @@ bool write(MPD::MutableSong &s)
+ {
+ writeID3v2Tags(s, mpeg_file->ID3v2Tag(true));
+ // write id3v2.4 tags only
+- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))
++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2,
++ TagLib::File::StripOthers,
++ TagLib::ID3v2::v4,
++ TagLib::File::DoNotDuplicate))
+ return false;
+ // do not call generic save() as it will duplicate tags
+ saved = true;
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..02f26388eed645 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 930b683330a0e7c218235752c74188a37936f398 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 34/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 1b8ebcd5135b37a4f4d3abe8357deb4bbb4608a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 35/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 1 +
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 506e88a230b759..e24fc5cd9b0eaf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -823,6 +823,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 578a48f617b948b16cfc0b87efb8f6942e723d09 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 36/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From c6d284995b38e340ff1bb5ea3b85f9e97384c5e6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:08:19 +0100
Subject: [PATCH 37/41] kodi: revbump for libtag
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 95b79cc86e2e50..5985cafb6f3d56 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=21.1
-revision=2
+revision=3
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
From 402003a04a6ca58e94d3847dd1ddf797f58f563a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 38/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From e2cf3ecd3364db82938f96438084ca5aff577c3a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 39/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 14ed8543d5465e80d6237cb4c69a68fc8debaac3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 40/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d7690bc32e5bd806fa6a4426027d46104e950976 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 41/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (45 preceding siblings ...)
2025-03-18 20:30 ` slymattz
@ 2025-03-19 13:42 ` slymattz
2025-03-19 13:48 ` slymattz
` (48 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-19 13:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2017 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 81143 bytes --]
From cf0d8d0b50f10aa464ded9de7484f74c36be6581 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 640e3b2b665f51..8a899097430d77 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 52af5fe21afe00715f51ff3751e756ec5ea9d809 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 2d9c5e673e6f1a544a51f0ea76f77a55edde926a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From a65455b8692bba49544aa3850c1888475bfea46f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 125d8620efa00363f926730608a225d471359c99 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 9ae1b59dd314c4dea1ac48c75f4ad0dca97df969 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From acc9f9796e18fa7167fb825b054c2c49cf23b315 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 9b4cab9947a1bd3d2c89468c9779b9f8a8812b49 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From a9e0658d127245f116ca7b5431c3e12001bd8dc9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From 9ce09e2027ec757c7bed81e2e34df735256ea2b0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 290c2006b599b66cf2a29d3eb8f6babfce58f9ac Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From b3c7e0a55db393300750027af3ae7825e3a14445 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 8286b46696e8ca47718380ed612072a9971d33fc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From ac388e40f5e4bdee5dd08d65c2b151f657844ce1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From c027371471aa90bbae22d8807c39595f6138c38b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From c93d41b4a90317768ad8c729e506b5b80ac89600 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 16/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 3cb28f09fdf3d14af5e7000e3014732fc2c54cd2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 17/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 138fc6c9f72b09618adb8bae3ac6764d1f9ed2a9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 18/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From e663d7c22240d9740361a6df39610ec2517779f9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 19/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 81eeca491b4151521b2f1586bdc59ccb76a7d5ae Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 20/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From c0824823cdd2f7561a0e2741ce4dc0ca4f4d4640 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 21/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From ba92754bee0b373b61f9c32a3a1a45140bd381de Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 22/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 5bf10bc4431649cc4d0ca018af1c35d15430cefd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 23/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 12b31f02d3704d607983b288939374a0b12306a2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 24/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From f54f8fc63b3b5ed297d2771dacaa0f4c1c8b9de9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 25/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From 8cf2aae9e83b92e83882461f3e1a4fa6f168da8d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 26/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 07998e8e0fdfdc45ca89dee0734f3ee5c3a1dca1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 27/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From f19aed63e7ccf3f4adbb7a3deb8da8ea7fe7077b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 28/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From fc9e5e0e91ed3905a27bdb4c017775e590ed53fb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 29/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 874af069074113c1c58026dc1e8f2b96fed13370 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 30/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4aae2f7e587d91..5e2468d5526848 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 0b95f3639534c77b38b7950a0b94694fc47325cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 31/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 8a899097430d77..d3e6a55af15de3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1234,8 +1234,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5e2468d5526848..dbf26c186680b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From 35e00f153462dc5e2c5f4823c46b255faaa401d7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 32/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbf26c186680b6..506e88a230b759 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 8fef97e12a12123d2c25f222f05b90ecd9173e07 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 33/41] ncmpcpp: revbump for libtag
---
srcpkgs/ncmpcpp/patches/taglib2-extras.patch | 22 +++++++++
srcpkgs/ncmpcpp/patches/taglib2.patch | 49 ++++++++++++++++++++
srcpkgs/ncmpcpp/template | 2 +-
3 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2-extras.patch
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2.patch
diff --git a/srcpkgs/ncmpcpp/patches/taglib2-extras.patch b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
new file mode 100644
index 00000000000000..8c362b68ad2c73
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
@@ -0,0 +1,22 @@
+From 81e5cf58b44be4ec0dc50722e2ed6d534df3973d Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Thu, 30 May 2024 14:58:09 +0200
+Subject: [PATCH] extras: fix compilation with taglib 2.0
+
+---
+ extras/artist_to_albumartist.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extras/artist_to_albumartist.cpp b/extras/artist_to_albumartist.cpp
+index c3ddfee3a..0349d0aed 100644
+--- a/extras/artist_to_albumartist.cpp
++++ b/extras/artist_to_albumartist.cpp
+@@ -34,7 +34,7 @@ enum class CopyResult { Success, NoArtist, AlbumArtistAlreadyInPlace };
+ bool is_framelist_empty(const TagLib::ID3v2::FrameList &list)
+ {
+ for (auto it = list.begin(); it != list.end(); ++it)
+- if ((*it)->toString() != TagLib::String::null)
++ if (!(*it)->toString().isEmpty())
+ return false;
+ return true;
+ }
diff --git a/srcpkgs/ncmpcpp/patches/taglib2.patch b/srcpkgs/ncmpcpp/patches/taglib2.patch
new file mode 100644
index 00000000000000..fac6b0120231cb
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2.patch
@@ -0,0 +1,49 @@
+From dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Wed, 7 Feb 2024 14:28:26 +0100
+Subject: [PATCH] Fix compilation with taglib 2.0
+
+---
+ src/tags.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/tags.cpp b/src/tags.cpp
+index 6cd6a8c27..6395807ae 100644
+--- a/src/tags.cpp
++++ b/src/tags.cpp
+@@ -123,12 +123,12 @@ void writeCommonTags(const MPD::MutableSong &s, TagLib::Tag *tag)
+ tag->setArtist(ToWString(s.getArtist()));
+ tag->setAlbum(ToWString(s.getAlbum()));
+ try {
+- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate()));
++ tag->setYear(boost::lexical_cast<unsigned>(s.getDate()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+ try {
+- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack()));
++ tag->setTrack(boost::lexical_cast<unsigned>(s.getTrack()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+@@ -261,7 +261,7 @@ void read(mpd_song *s)
+ if (f.isNull())
+ return;
+
+- setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->length()));
++ setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->lengthInSeconds()));
+
+ if (auto mpeg_file = dynamic_cast<TagLib::MPEG::File *>(f.file()))
+ {
+@@ -306,7 +306,10 @@ bool write(MPD::MutableSong &s)
+ {
+ writeID3v2Tags(s, mpeg_file->ID3v2Tag(true));
+ // write id3v2.4 tags only
+- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))
++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2,
++ TagLib::File::StripOthers,
++ TagLib::ID3v2::v4,
++ TagLib::File::DoNotDuplicate))
+ return false;
+ // do not call generic save() as it will duplicate tags
+ saved = true;
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..02f26388eed645 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 930b683330a0e7c218235752c74188a37936f398 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 34/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 1b8ebcd5135b37a4f4d3abe8357deb4bbb4608a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 35/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 1 +
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 506e88a230b759..e24fc5cd9b0eaf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -823,6 +823,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 578a48f617b948b16cfc0b87efb8f6942e723d09 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 36/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From cf6bf67131a7bda708b0b023055b62ef71242f8c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:08:19 +0100
Subject: [PATCH 37/41] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 95b79cc86e2e50..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=2
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
From f5c3fa695036435e5521c9f7d96b31387f92790d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 38/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 9a0538d976714a1eb23e41d46d13be240d6dfce0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 39/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From c071132327039585145e589b26a4c5f467b78487 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 40/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 77ada2af70e750f8791fc6af42cbeecdc9a293c4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 41/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (46 preceding siblings ...)
2025-03-19 13:42 ` slymattz
@ 2025-03-19 13:48 ` slymattz
2025-03-19 17:37 ` slymattz
` (47 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-19 13:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2017 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 81143 bytes --]
From d2ea3098c7feb5d7cfadcd16c50e6f2b482ad363 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 3ca8263a7404ec..4f591dbc2c7cb7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 4cc4b8c3f1760b6e6a989e23eceaa81070e17676 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 106e91fc6ebefefc908fd35b51c370e40cb6236c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 0173be1845fb929af5174eac15c2b55f60df21e4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From abacdf8a40b32158df58bbf7a42142c5fbc08464 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 73769f876bb722a4d9588260f59dfc6d7bb36f51 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From ea92fe24b98a110948dd4211e996494936e37e50 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 6f3e76800175272eb22dd7808e2250c22d063151 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From ba29b5debdedf4d79dd49b3d078a85017838ab17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From f9157ff80845d03a4aa6d7d8496b0adc16e9af65 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From c1baa228516f07cc1642a97f65b511d543f1ab08 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 175 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 177 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..ba89b8ab4edd9a
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,175 @@
+From d33adab5d15543435080390778441e2ad9720520 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+---
+ configure.ac | 2 +-
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 87163313..8772d52b 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54dd..4f99b24b 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c4..1728189c 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+--
+GitLab
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From 245406b4ba2e8100d92c5b7c71c265be003566b7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From a4b2e73af81cdc575a0960c46303602b55147183 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From f468e9133346a08d8fd76ebbce4fd6834ab3743b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From eb17aa3a48d5de0136fcc290cd6f5cfc4d788147 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From fbbefb52a83eb9e6abc14f95b848bf2a0cdf1d56 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 16/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 35a1c973160d795e8a27fd0b837cdde7e55e471f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 17/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 4882c3afe94601dcb32cbbecf768316ddee090e7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 18/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 9ca5c6b4cdf3c034b5581d42e0ea9de5618b7458 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 19/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 7221d671bed1cf8e91d3134ecebe6f73a2a09be2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 20/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 6137f171b7da4fc03ee44963b0d99a3f0069362b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 21/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 64c53efb0291f7c488e8f5d1910f358bb1ef19b1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 22/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 418471a77a3b09759f09ba4fe3d7de11feff7651 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 23/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From a909c236c906c62911c41b2d0d92a298a2db8737 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 24/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 33d2fd5580560efdcac05e6d136bea17cf103932 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 25/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From f31446f5d1bfaac848bd351bc39ea775c004a695 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 26/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From e208cde7afe6b513691dda96a133652602b67a1c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 27/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From cfa571c094033767595fb814a263837276342b16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 28/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From a997632cb564e93281736fa25ffee108b9b17b36 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 29/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From c638f61673c1ec9cb4e4bc1fc4df459e962d0412 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 30/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4aae2f7e587d91..5e2468d5526848 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 908ae121fe9b754ec75783156ee783663d8f66d5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 31/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 4f591dbc2c7cb7..c124e4407ad075 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1233,8 +1233,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5e2468d5526848..dbf26c186680b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From b701a67bfc7c2e1cbdea2badb9624a2d4d4def6d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 32/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbf26c186680b6..506e88a230b759 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 6ba7f9fde7545c9236b00c9fe19b7afad585730a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 33/41] ncmpcpp: revbump for libtag
---
srcpkgs/ncmpcpp/patches/taglib2-extras.patch | 22 +++++++++
srcpkgs/ncmpcpp/patches/taglib2.patch | 49 ++++++++++++++++++++
srcpkgs/ncmpcpp/template | 2 +-
3 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2-extras.patch
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2.patch
diff --git a/srcpkgs/ncmpcpp/patches/taglib2-extras.patch b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
new file mode 100644
index 00000000000000..8c362b68ad2c73
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
@@ -0,0 +1,22 @@
+From 81e5cf58b44be4ec0dc50722e2ed6d534df3973d Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Thu, 30 May 2024 14:58:09 +0200
+Subject: [PATCH] extras: fix compilation with taglib 2.0
+
+---
+ extras/artist_to_albumartist.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extras/artist_to_albumartist.cpp b/extras/artist_to_albumartist.cpp
+index c3ddfee3a..0349d0aed 100644
+--- a/extras/artist_to_albumartist.cpp
++++ b/extras/artist_to_albumartist.cpp
+@@ -34,7 +34,7 @@ enum class CopyResult { Success, NoArtist, AlbumArtistAlreadyInPlace };
+ bool is_framelist_empty(const TagLib::ID3v2::FrameList &list)
+ {
+ for (auto it = list.begin(); it != list.end(); ++it)
+- if ((*it)->toString() != TagLib::String::null)
++ if (!(*it)->toString().isEmpty())
+ return false;
+ return true;
+ }
diff --git a/srcpkgs/ncmpcpp/patches/taglib2.patch b/srcpkgs/ncmpcpp/patches/taglib2.patch
new file mode 100644
index 00000000000000..fac6b0120231cb
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2.patch
@@ -0,0 +1,49 @@
+From dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Wed, 7 Feb 2024 14:28:26 +0100
+Subject: [PATCH] Fix compilation with taglib 2.0
+
+---
+ src/tags.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/tags.cpp b/src/tags.cpp
+index 6cd6a8c27..6395807ae 100644
+--- a/src/tags.cpp
++++ b/src/tags.cpp
+@@ -123,12 +123,12 @@ void writeCommonTags(const MPD::MutableSong &s, TagLib::Tag *tag)
+ tag->setArtist(ToWString(s.getArtist()));
+ tag->setAlbum(ToWString(s.getAlbum()));
+ try {
+- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate()));
++ tag->setYear(boost::lexical_cast<unsigned>(s.getDate()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+ try {
+- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack()));
++ tag->setTrack(boost::lexical_cast<unsigned>(s.getTrack()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+@@ -261,7 +261,7 @@ void read(mpd_song *s)
+ if (f.isNull())
+ return;
+
+- setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->length()));
++ setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->lengthInSeconds()));
+
+ if (auto mpeg_file = dynamic_cast<TagLib::MPEG::File *>(f.file()))
+ {
+@@ -306,7 +306,10 @@ bool write(MPD::MutableSong &s)
+ {
+ writeID3v2Tags(s, mpeg_file->ID3v2Tag(true));
+ // write id3v2.4 tags only
+- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))
++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2,
++ TagLib::File::StripOthers,
++ TagLib::ID3v2::v4,
++ TagLib::File::DoNotDuplicate))
+ return false;
+ // do not call generic save() as it will duplicate tags
+ saved = true;
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..02f26388eed645 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 1c55a3cab3ec558dc0fef83332da65c469089696 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 34/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 3d94343661ffca2e9f0eced0a0c59928ff6fb31d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 35/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 1 +
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 506e88a230b759..e24fc5cd9b0eaf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -823,6 +823,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 92e3c9cbf4388ba4844619a9c833b9f11303330b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 36/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From 8f83d9fd55dd784fba7936ca570d7860a2925fe7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 37/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From bdb9124460f8a2d73bd6fb1fc970f047b422f629 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 38/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From d4b9287aa17916a5a809881e53cf78a133a1ae95 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 39/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 68f2a39ce001faf25b79df46e1acd771bb2d4546 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 40/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 0314046415c51955237dc5fb522f82db4e552e6a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 19 Mar 2025 14:47:49 +0100
Subject: [PATCH 41/41] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=3
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (47 preceding siblings ...)
2025-03-19 13:48 ` slymattz
@ 2025-03-19 17:37 ` slymattz
2025-03-20 11:13 ` slymattz
` (46 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-19 17:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2111 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
EDIT 3/19/25: resolved a base conflict (updated kodi to 21.2 as 21.1 wouldn't build for i686).
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 85896 bytes --]
From d2ea3098c7feb5d7cfadcd16c50e6f2b482ad363 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 3ca8263a7404ec..4f591dbc2c7cb7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 4cc4b8c3f1760b6e6a989e23eceaa81070e17676 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 106e91fc6ebefefc908fd35b51c370e40cb6236c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 0173be1845fb929af5174eac15c2b55f60df21e4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From abacdf8a40b32158df58bbf7a42142c5fbc08464 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 73769f876bb722a4d9588260f59dfc6d7bb36f51 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From ea92fe24b98a110948dd4211e996494936e37e50 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 6f3e76800175272eb22dd7808e2250c22d063151 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From ba29b5debdedf4d79dd49b3d078a85017838ab17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From f9157ff80845d03a4aa6d7d8496b0adc16e9af65 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 9e1301d0f5ba465dfee028dac02d741cd0cc7f95 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 324 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 326 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..c1946ab55d4f44
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,324 @@
+From: =?utf-8?b?QmFsbMOzIEd5w7ZyZ3k=?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+Forwarded: https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/16
+Bug-Debian: https://bugs.debian.org/1092704
+---
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8716331..8772d52 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54d..4f99b24 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c..1728189 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 11 Jan 2025 14:48:46 -0500
+Subject: taglib-2 further fix
+
+Further fix compatibility with taglib 2.x on 32-bit architecture.
+---
+ src/tags/gio_wrapper.cc | 20 ++++++++++----------
+ src/tags/gio_wrapper.h | 20 ++++++++++----------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8772d52..8fdd9e7 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,7 +47,7 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (ulong len)
++GIO_InputStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -95,7 +95,7 @@ GIO_InputStream::isOpen () const
+ }
+
+ void
+-GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_InputStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -133,13 +133,13 @@ GIO_InputStream::clear ()
+ }
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::length ()
+ {
+ if (error)
+@@ -161,7 +161,7 @@ GIO_InputStream::length ()
+ }
+
+ void
+-GIO_InputStream::truncate (long int len)
++GIO_InputStream::truncate (TagLib::offset_t len)
+ {
+ g_warning ("%s", "Trying to truncate read-only file");
+ }
+@@ -200,7 +200,7 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (ulong len)
++GIO_IOStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -400,7 +400,7 @@ GIO_IOStream::isOpen () const
+ }
+
+ void
+-GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_IOStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -434,13 +434,13 @@ GIO_IOStream::clear ()
+ g_clear_error (&error);
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::length ()
+ {
+ long rv = -1;
+@@ -464,7 +464,7 @@ GIO_IOStream::length ()
+ }
+
+ void
+-GIO_IOStream::truncate (long int len)
++GIO_IOStream::truncate (TagLib::offset_t len)
+ {
+ if (error)
+ {
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index 4f99b24..fc634ab 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,17 +33,17 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+@@ -61,17 +61,17 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From 1dba7a9b9a84d4a9a6d1e9609f0446b1c633ac54 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From f308e0ef5392197728213d862d53c7f8442264e4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 8dc65717e562e632c34b694707e94f7748eea33b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From d714a526c433c2da79a37071e393681e82d1d22a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 1937b5debf217b26c1c5937d096d1261de6baf6e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 16/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From bd69438c44c1d0ed83b3eadcbb7a582f08a610a1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 17/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 32ed04ffefb17c8799292b43ffb17e2f25e4d416 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 18/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 1ac8bd3802a1615868870649ad493074dd72daa3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 19/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 367fd800234ffef0a47f6a0c585dafc7d62eec02 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 20/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 1d99b7e66f57817414b9cdb06172a9f1ad601243 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 21/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 05ca76922fda3ceafeac578ce2a16900144a5278 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 22/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From bae821d0405a17119c35ccbc972d38b93b77d48a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 23/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From d172e2eae5c684a9c523b269a3c0a9603278e591 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 24/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 327d718f7ff08b2a2ab6e777b2a24178a43a857c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 25/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From 81b094bd6044c1da7284bf032e0848d5836b19ac Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 26/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 0b03a83be5b61997b9e704295f2b9d780eb6e858 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 27/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 93046927f07115cc5139b47b0d20ceb3844d97e5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 28/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From 09370bdbfc7b9828bd099a69ff99e062f819a32a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 29/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 4624618aeac478b840eafe0a7d875e5c6deb651a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 30/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4aae2f7e587d91..5e2468d5526848 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 863bd62d84d44caac7b0d50e40aa134a14c8d7cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 31/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 4f591dbc2c7cb7..c124e4407ad075 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1233,8 +1233,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5e2468d5526848..dbf26c186680b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From 5aae086b271e29ace9848cc15bb0a9c3ec4724af Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 32/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbf26c186680b6..506e88a230b759 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From a2e849f236dc5cf15ef873113a12b428623442e8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 33/41] ncmpcpp: revbump for libtag
---
srcpkgs/ncmpcpp/patches/taglib2-extras.patch | 22 +++++++++
srcpkgs/ncmpcpp/patches/taglib2.patch | 49 ++++++++++++++++++++
srcpkgs/ncmpcpp/template | 2 +-
3 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2-extras.patch
create mode 100644 srcpkgs/ncmpcpp/patches/taglib2.patch
diff --git a/srcpkgs/ncmpcpp/patches/taglib2-extras.patch b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
new file mode 100644
index 00000000000000..8c362b68ad2c73
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2-extras.patch
@@ -0,0 +1,22 @@
+From 81e5cf58b44be4ec0dc50722e2ed6d534df3973d Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Thu, 30 May 2024 14:58:09 +0200
+Subject: [PATCH] extras: fix compilation with taglib 2.0
+
+---
+ extras/artist_to_albumartist.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extras/artist_to_albumartist.cpp b/extras/artist_to_albumartist.cpp
+index c3ddfee3a..0349d0aed 100644
+--- a/extras/artist_to_albumartist.cpp
++++ b/extras/artist_to_albumartist.cpp
+@@ -34,7 +34,7 @@ enum class CopyResult { Success, NoArtist, AlbumArtistAlreadyInPlace };
+ bool is_framelist_empty(const TagLib::ID3v2::FrameList &list)
+ {
+ for (auto it = list.begin(); it != list.end(); ++it)
+- if ((*it)->toString() != TagLib::String::null)
++ if (!(*it)->toString().isEmpty())
+ return false;
+ return true;
+ }
diff --git a/srcpkgs/ncmpcpp/patches/taglib2.patch b/srcpkgs/ncmpcpp/patches/taglib2.patch
new file mode 100644
index 00000000000000..fac6b0120231cb
--- /dev/null
+++ b/srcpkgs/ncmpcpp/patches/taglib2.patch
@@ -0,0 +1,49 @@
+From dc46f7a49b5bd0fdd2b3b181ece88a3fb8482dc5 Mon Sep 17 00:00:00 2001
+From: Andrzej Rybczak <andrzej@rybczak.net>
+Date: Wed, 7 Feb 2024 14:28:26 +0100
+Subject: [PATCH] Fix compilation with taglib 2.0
+
+---
+ src/tags.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/tags.cpp b/src/tags.cpp
+index 6cd6a8c27..6395807ae 100644
+--- a/src/tags.cpp
++++ b/src/tags.cpp
+@@ -123,12 +123,12 @@ void writeCommonTags(const MPD::MutableSong &s, TagLib::Tag *tag)
+ tag->setArtist(ToWString(s.getArtist()));
+ tag->setAlbum(ToWString(s.getAlbum()));
+ try {
+- tag->setYear(boost::lexical_cast<TagLib::uint>(s.getDate()));
++ tag->setYear(boost::lexical_cast<unsigned>(s.getDate()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'year' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+ try {
+- tag->setTrack(boost::lexical_cast<TagLib::uint>(s.getTrack()));
++ tag->setTrack(boost::lexical_cast<unsigned>(s.getTrack()));
+ } catch (boost::bad_lexical_cast &) {
+ std::cerr << "writeCommonTags: couldn't write 'track' tag to '" << s.getURI() << "' as it's not a positive integer\n";
+ }
+@@ -261,7 +261,7 @@ void read(mpd_song *s)
+ if (f.isNull())
+ return;
+
+- setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->length()));
++ setAttribute(s, "Time", boost::lexical_cast<std::string>(f.audioProperties()->lengthInSeconds()));
+
+ if (auto mpeg_file = dynamic_cast<TagLib::MPEG::File *>(f.file()))
+ {
+@@ -306,7 +306,10 @@ bool write(MPD::MutableSong &s)
+ {
+ writeID3v2Tags(s, mpeg_file->ID3v2Tag(true));
+ // write id3v2.4 tags only
+- if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))
++ if (!mpeg_file->save(TagLib::MPEG::File::ID3v2,
++ TagLib::File::StripOthers,
++ TagLib::ID3v2::v4,
++ TagLib::File::DoNotDuplicate))
+ return false;
+ // do not call generic save() as it will duplicate tags
+ saved = true;
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..02f26388eed645 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=11
+revision=12
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 7c513e645aa71d20cda731b9fc4791676e486f09 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 34/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From eb75e91581dbff19d44140203f01c5151e4b07af Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 35/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 1 +
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 506e88a230b759..e24fc5cd9b0eaf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -823,6 +823,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From bbde6507cc4c92eda8e1f3f22c1ca5380d969160 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 36/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From ff5a01ed8878b8339ef6a63e9d553f9e2c370205 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 37/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 6efcd24e938f4e3901bee0981a5d2e05ea4bfdb4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 38/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From d73fd9bb88f584397ee27cb56b305aeadebf4e42 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 39/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From a5a93e944ce35782469e0664a31b1a3617a443da Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 40/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From df2d8b4ff1ef5439df2fc06dca6eaca7a91e9c3b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 19 Mar 2025 14:47:49 +0100
Subject: [PATCH 41/41] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=3
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (48 preceding siblings ...)
2025-03-19 17:37 ` slymattz
@ 2025-03-20 11:13 ` slymattz
2025-03-24 16:19 ` slymattz
` (45 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-20 11:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2111 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
EDIT 3/19/25: resolved a base conflict (updated kodi to 21.2 as 21.1 wouldn't build for i686).
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 84305 bytes --]
From d2ea3098c7feb5d7cfadcd16c50e6f2b482ad363 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 3ca8263a7404ec..4f591dbc2c7cb7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 4cc4b8c3f1760b6e6a989e23eceaa81070e17676 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 106e91fc6ebefefc908fd35b51c370e40cb6236c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 0173be1845fb929af5174eac15c2b55f60df21e4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From abacdf8a40b32158df58bbf7a42142c5fbc08464 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 73769f876bb722a4d9588260f59dfc6d7bb36f51 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From ea92fe24b98a110948dd4211e996494936e37e50 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 6f3e76800175272eb22dd7808e2250c22d063151 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From ba29b5debdedf4d79dd49b3d078a85017838ab17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From f9157ff80845d03a4aa6d7d8496b0adc16e9af65 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 9e1301d0f5ba465dfee028dac02d741cd0cc7f95 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 324 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 326 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..c1946ab55d4f44
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,324 @@
+From: =?utf-8?b?QmFsbMOzIEd5w7ZyZ3k=?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+Forwarded: https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/16
+Bug-Debian: https://bugs.debian.org/1092704
+---
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8716331..8772d52 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54d..4f99b24 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c..1728189 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 11 Jan 2025 14:48:46 -0500
+Subject: taglib-2 further fix
+
+Further fix compatibility with taglib 2.x on 32-bit architecture.
+---
+ src/tags/gio_wrapper.cc | 20 ++++++++++----------
+ src/tags/gio_wrapper.h | 20 ++++++++++----------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8772d52..8fdd9e7 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,7 +47,7 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (ulong len)
++GIO_InputStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -95,7 +95,7 @@ GIO_InputStream::isOpen () const
+ }
+
+ void
+-GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_InputStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -133,13 +133,13 @@ GIO_InputStream::clear ()
+ }
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::length ()
+ {
+ if (error)
+@@ -161,7 +161,7 @@ GIO_InputStream::length ()
+ }
+
+ void
+-GIO_InputStream::truncate (long int len)
++GIO_InputStream::truncate (TagLib::offset_t len)
+ {
+ g_warning ("%s", "Trying to truncate read-only file");
+ }
+@@ -200,7 +200,7 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (ulong len)
++GIO_IOStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -400,7 +400,7 @@ GIO_IOStream::isOpen () const
+ }
+
+ void
+-GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_IOStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -434,13 +434,13 @@ GIO_IOStream::clear ()
+ g_clear_error (&error);
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::length ()
+ {
+ long rv = -1;
+@@ -464,7 +464,7 @@ GIO_IOStream::length ()
+ }
+
+ void
+-GIO_IOStream::truncate (long int len)
++GIO_IOStream::truncate (TagLib::offset_t len)
+ {
+ if (error)
+ {
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index 4f99b24..fc634ab 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,17 +33,17 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+@@ -61,17 +61,17 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From 1dba7a9b9a84d4a9a6d1e9609f0446b1c633ac54 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From f308e0ef5392197728213d862d53c7f8442264e4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 8dc65717e562e632c34b694707e94f7748eea33b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From d714a526c433c2da79a37071e393681e82d1d22a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:48:44 +0100
Subject: [PATCH 15/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 70f2c17b68fe09..48cb21355e43d1 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.10
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 1937b5debf217b26c1c5937d096d1261de6baf6e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 16/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From bd69438c44c1d0ed83b3eadcbb7a582f08a610a1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 17/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 32ed04ffefb17c8799292b43ffb17e2f25e4d416 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 18/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 1ac8bd3802a1615868870649ad493074dd72daa3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 19/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 367fd800234ffef0a47f6a0c585dafc7d62eec02 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 20/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 1d99b7e66f57817414b9cdb06172a9f1ad601243 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 21/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 05ca76922fda3ceafeac578ce2a16900144a5278 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 22/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From bae821d0405a17119c35ccbc972d38b93b77d48a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 23/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From d172e2eae5c684a9c523b269a3c0a9603278e591 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 24/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 327d718f7ff08b2a2ab6e777b2a24178a43a857c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 25/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From 81b094bd6044c1da7284bf032e0848d5836b19ac Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 26/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 0b03a83be5b61997b9e704295f2b9d780eb6e858 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 27/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 93046927f07115cc5139b47b0d20ceb3844d97e5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 28/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From 09370bdbfc7b9828bd099a69ff99e062f819a32a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 29/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 4624618aeac478b840eafe0a7d875e5c6deb651a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 30/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4aae2f7e587d91..5e2468d5526848 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -313,6 +313,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 863bd62d84d44caac7b0d50e40aa134a14c8d7cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 31/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 4f591dbc2c7cb7..c124e4407ad075 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1233,8 +1233,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5e2468d5526848..dbf26c186680b6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -454,6 +454,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From 5aae086b271e29ace9848cc15bb0a9c3ec4724af Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 32/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index dbf26c186680b6..506e88a230b759 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -489,6 +489,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 67938751ea261fa29b78b8cd5ef48d5b9ed3324b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 33/41] ncmpcpp: update to 0.10.1, use taglib2
---
srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ----------------
srcpkgs/ncmpcpp/template | 20 ++++++++++----------
2 files changed, 10 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/ncmpcpp/patches/socket-inode.patch
diff --git a/srcpkgs/ncmpcpp/patches/socket-inode.patch b/srcpkgs/ncmpcpp/patches/socket-inode.patch
deleted file mode 100644
index 6bf92146ea0914..00000000000000
--- a/srcpkgs/ncmpcpp/patches/socket-inode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Support sockets without a socket inode
-# https://github.com/ncmpcpp/ncmpcpp/commit/40e4f98ee896ea10967eb1c4323bb718331eabea
-diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
-index ccdee31d..9a92e5df 100644
---- a/src/mpdpp.cpp
-+++ b/src/mpdpp.cpp
-@@ -147,7 +147,7 @@ unsigned Connection::Version() const
- void Connection::SetHostname(const std::string &host)
- {
- size_t at = host.find("@");
-- if (at != std::string::npos)
-+ if (at != 0 && at != std::string::npos)
- {
- m_password = host.substr(0, at);
- m_host = host.substr(at+1);
-
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..b0fba7f09df2a8 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,25 +1,25 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
-version=0.9.2
-revision=11
+version=0.10.1
+revision=1
build_style=gnu-configure
-configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
-hostmakedepends="pkg-config"
-makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+configure_args=" --enable-clock --enable-outputs --enable-unicode
+ --enable-visualizer --with-curl --with-taglib --with-fftw"
+hostmakedepends="automake libtool pkg-config"
+makedepends="boost-devel fftw-devel icu-devel libcurl-devel libltdl-devel
+ libmpdclient-devel readline-devel taglib-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://rybczak.net/ncmpcpp"
-distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
+distfiles="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${version}.tar.gz"
+checksum=ddc89da86595d272282ae8726cc7913867b9517eec6e765e66e6da860b58e2f9
# Required by waddwstr() with ncurses on musl
CXXFLAGS="-D_XOPEN_SOURCE=600"
pre_configure() {
- vsed -e '/^docdir/d' -i {,doc/}Makefile.in
+ autoreconf -fiv
}
post_install() {
From 0b407985bcc18f5699612971bdb21f7e57233b55 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 34/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 7974a5410961c50df9c8b94ca394fd7888b025ce Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 35/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 1 +
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 506e88a230b759..e24fc5cd9b0eaf 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -823,6 +823,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 2ee0371ede9cffdac020757ccb6d41d4fd39d3e4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 36/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From e9ba00f787f6453e16bae569d0043be935694766 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 37/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d9e881ce22dcd2cdf74c57386f5e5b1dd8f07c72 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 38/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From c8baee02ddee16a806a54ef7afffbc6ae9a858a9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 39/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 1156ad56358809755379464efaff7bc506b57ea9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 40/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 2128695c3d4e5e5a26c9d537cb6e29eb6e97628c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 19 Mar 2025 14:47:49 +0100
Subject: [PATCH 41/41] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=3
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (49 preceding siblings ...)
2025-03-20 11:13 ` slymattz
@ 2025-03-24 16:19 ` slymattz
2025-03-26 13:18 ` [PR PATCH] [Updated] " slymattz
` (44 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-24 16:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 474 bytes --]
New comment by slymattz on void-packages repository
https://github.com/void-linux/void-packages/pull/54493#issuecomment-2691478528
Comment:
So it turns out the builds for x86_64-{glibc,musl} and i686 complete fine. If I'm not mistaken, these errors could be ignored.
```
id3ted-1.0_2: broken, unresolvable shlib `libtag.so.1'
Transaction aborted due to unresolved shlibs.
Failed to install 'taglib' and 'id3ted-1.0_2'
Error: Process completed with exit code 1.
```
^ permalink raw reply [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (50 preceding siblings ...)
2025-03-24 16:19 ` slymattz
@ 2025-03-26 13:18 ` slymattz
2025-03-27 10:06 ` slymattz
` (43 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-26 13:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2537 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
EDIT 3/19/25: resolved a base conflict (updated kodi to 21.2 as 21.1 wouldn't build for i686).
About removed packages:
- loudgain: could be replaced with rsgain (not packaged in Void at this time.)
- id3ted: there are plenty of alternatives, be it GUI-based or CLI. In the repo there's kid3, picard or puddletag, for instance.
- libtaginfo: there are alternatives like python3-mutagen or ffmpeg etc.
- soundkonverter: could be replaced with other GUI converters such as k3b, clementine or asunder to name a few.
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 84305 bytes --]
From 5a36c8a1d9511b25a993ca8b5a7cf8549a6ba5da Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 3a5a8ce427f6ec..e1d983a64f22e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c9c5cbbc47173b535d93aa040b7fb7e7afe6e5c6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From d1e0103e5184f90c41507cacaed7d06d00c6c07c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 69a197b8d45c7ede6e28d5811aa0e28cf6e7bf15 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 60a2d4157ae45e005824e8614ef2b26b416a79bd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 6d34a285fc78a00b51173d4850a644a00f331d90 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 36c0d471db1bae0a840e044a529dd408ba1901ac Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From bc5608fd8e2cb2cdd1be5799f81ad644e8b87a42 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From d84e75e544f9ec86b2413be17411cc0b94b75623 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From dae48c519b9fdf04cf486f23bc12b05206097ffc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 4ee3863799f8c32cd83ab4aeaeb97697395b1f4e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 324 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 326 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..c1946ab55d4f44
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,324 @@
+From: =?utf-8?b?QmFsbMOzIEd5w7ZyZ3k=?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+Forwarded: https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/16
+Bug-Debian: https://bugs.debian.org/1092704
+---
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8716331..8772d52 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54d..4f99b24 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c..1728189 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 11 Jan 2025 14:48:46 -0500
+Subject: taglib-2 further fix
+
+Further fix compatibility with taglib 2.x on 32-bit architecture.
+---
+ src/tags/gio_wrapper.cc | 20 ++++++++++----------
+ src/tags/gio_wrapper.h | 20 ++++++++++----------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8772d52..8fdd9e7 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,7 +47,7 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (ulong len)
++GIO_InputStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -95,7 +95,7 @@ GIO_InputStream::isOpen () const
+ }
+
+ void
+-GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_InputStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -133,13 +133,13 @@ GIO_InputStream::clear ()
+ }
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::length ()
+ {
+ if (error)
+@@ -161,7 +161,7 @@ GIO_InputStream::length ()
+ }
+
+ void
+-GIO_InputStream::truncate (long int len)
++GIO_InputStream::truncate (TagLib::offset_t len)
+ {
+ g_warning ("%s", "Trying to truncate read-only file");
+ }
+@@ -200,7 +200,7 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (ulong len)
++GIO_IOStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -400,7 +400,7 @@ GIO_IOStream::isOpen () const
+ }
+
+ void
+-GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_IOStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -434,13 +434,13 @@ GIO_IOStream::clear ()
+ g_clear_error (&error);
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::length ()
+ {
+ long rv = -1;
+@@ -464,7 +464,7 @@ GIO_IOStream::length ()
+ }
+
+ void
+-GIO_IOStream::truncate (long int len)
++GIO_IOStream::truncate (TagLib::offset_t len)
+ {
+ if (error)
+ {
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index 4f99b24..fc634ab 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,17 +33,17 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+@@ -61,17 +61,17 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From cb7df6b46152eccdb38d482372ccfd29a410c545 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 1a08845046edf70a615e560fe2468ab05768e9c4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: revbump for libtag
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..ffe1e16ce13e9f 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.12.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 5539195036bd01e2fc9ba9de7b7808b8cf53ddd8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 331ed21d7e472122da09d8bd0dc10fd1e02c3b48 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 15/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 2e554a69ba1a0d796b6c2f3f0caec6613babb12d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 16/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From a91f8a8b60bd39905e1744ed260c6aae8ea3da59 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 17/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 7d984287f73535f8a972724ce2bc52bc91883550 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 18/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 6c1a833aa86abbafe307762d94bb24bdeeb11d88 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 19/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 299956ab422a3881c6296672aedea637a220e529 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 20/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From e2719d7a0c066c5076fcd2a5427d24395c18edf8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 21/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 5a05f0491e346271f29f1e66dd3d805cc55db643 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 22/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 1e5a87c61f8118c9f732fce5849ce632365506dd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 23/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 23d9653261459780d3aa75e1c27388d608d4b881 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 24/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From fefd7941d7045c3564ae54ea9ed2e4e4b0a49a1a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 25/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From f08ff781bd3584d5ed35e5989f23ed7570d20645 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 26/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 6a987e9da41c6594bef2387a4b46af729c429073 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 27/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From 72ef10b685dc107fd7073ed08824b558531a0232 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 28/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 577dc614477d94c3aa4c711e4d1179b92214c8e4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 29/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1bda568711478c..c11d62df6b03e6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -314,6 +314,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 7589b2955e44d04965b837eb9de6af81aa374679 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 30/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index e1d983a64f22e1..ebe5468228d8d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1233,8 +1233,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c11d62df6b03e6..23767d83a6b112 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -455,6 +455,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From 8dd554a82f9aefb17834dbf2f1a046deacd39777 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 31/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 23767d83a6b112..4b553da9bb204b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -490,6 +490,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 7ee764ed40e9dc308a5db07c65b271f9d343f7e9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 32/41] ncmpcpp: update to 0.10.1, use taglib2
---
srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ----------------
srcpkgs/ncmpcpp/template | 20 ++++++++++----------
2 files changed, 10 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/ncmpcpp/patches/socket-inode.patch
diff --git a/srcpkgs/ncmpcpp/patches/socket-inode.patch b/srcpkgs/ncmpcpp/patches/socket-inode.patch
deleted file mode 100644
index 6bf92146ea0914..00000000000000
--- a/srcpkgs/ncmpcpp/patches/socket-inode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Support sockets without a socket inode
-# https://github.com/ncmpcpp/ncmpcpp/commit/40e4f98ee896ea10967eb1c4323bb718331eabea
-diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
-index ccdee31d..9a92e5df 100644
---- a/src/mpdpp.cpp
-+++ b/src/mpdpp.cpp
-@@ -147,7 +147,7 @@ unsigned Connection::Version() const
- void Connection::SetHostname(const std::string &host)
- {
- size_t at = host.find("@");
-- if (at != std::string::npos)
-+ if (at != 0 && at != std::string::npos)
- {
- m_password = host.substr(0, at);
- m_host = host.substr(at+1);
-
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..b0fba7f09df2a8 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,25 +1,25 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
-version=0.9.2
-revision=11
+version=0.10.1
+revision=1
build_style=gnu-configure
-configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
-hostmakedepends="pkg-config"
-makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+configure_args=" --enable-clock --enable-outputs --enable-unicode
+ --enable-visualizer --with-curl --with-taglib --with-fftw"
+hostmakedepends="automake libtool pkg-config"
+makedepends="boost-devel fftw-devel icu-devel libcurl-devel libltdl-devel
+ libmpdclient-devel readline-devel taglib-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://rybczak.net/ncmpcpp"
-distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
+distfiles="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${version}.tar.gz"
+checksum=ddc89da86595d272282ae8726cc7913867b9517eec6e765e66e6da860b58e2f9
# Required by waddwstr() with ncurses on musl
CXXFLAGS="-D_XOPEN_SOURCE=600"
pre_configure() {
- vsed -e '/^docdir/d' -i {,doc/}Makefile.in
+ autoreconf -fiv
}
post_install() {
From 840a85de426daa42d9ae3ce37744178883cfe4b4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 33/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 8a463543beedc84031dde5810995bb642aadaa16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 34/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 1 +
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4b553da9bb204b..f53d802ff77f51 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -827,6 +827,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From b260701c779c558018ac48c26f5da7860931c1ac Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 35/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From 5c206d95a1dfaa663196569025cb7f1acf18f357 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 36/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From edb830039494544508aa9e11087f33ef2220763d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 37/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 6f7ff3cb3357ee9cdea8896a8f2a798ab743cc3b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 38/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From d880221b3e3d08294d3203391e1c06cee401ce5b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 39/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 3e9434e557f63bfa232c92d6c698fde99e891e6d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 19 Mar 2025 14:47:49 +0100
Subject: [PATCH 40/41] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=3
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
From 121958cf93ca8e6ea606865e3cc2003e7d1e8057 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Mar 2025 14:15:46 +0100
Subject: [PATCH 41/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 34024aff716797..dadf10f47925fa 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.11
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (51 preceding siblings ...)
2025-03-26 13:18 ` [PR PATCH] [Updated] " slymattz
@ 2025-03-27 10:06 ` slymattz
2025-04-06 14:50 ` slymattz
` (42 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-03-27 10:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2589 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
EDIT 3/19/25: resolved a base conflict (updated kodi to 21.2 as 21.1 wouldn't build for i686).
EDIT 3/26/25: resolve a gst-plugins-good1 conflict
About removed packages:
- loudgain: could be replaced with rsgain (not packaged in Void at this time.)
- id3ted: there are plenty of alternatives, be it GUI-based or CLI. In the repo there's kid3, picard or puddletag, for instance.
- libtaginfo: there are alternatives like python3-mutagen or ffmpeg etc.
- soundkonverter: could be replaced with other GUI converters such as k3b, clementine or asunder to name a few.
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 85186 bytes --]
From 5a36c8a1d9511b25a993ca8b5a7cf8549a6ba5da Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 3a5a8ce427f6ec..e1d983a64f22e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c9c5cbbc47173b535d93aa040b7fb7e7afe6e5c6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From d1e0103e5184f90c41507cacaed7d06d00c6c07c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 69a197b8d45c7ede6e28d5811aa0e28cf6e7bf15 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 60a2d4157ae45e005824e8614ef2b26b416a79bd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 6d34a285fc78a00b51173d4850a644a00f331d90 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 36c0d471db1bae0a840e044a529dd408ba1901ac Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From bc5608fd8e2cb2cdd1be5799f81ad644e8b87a42 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From d84e75e544f9ec86b2413be17411cc0b94b75623 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From dae48c519b9fdf04cf486f23bc12b05206097ffc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 4ee3863799f8c32cd83ab4aeaeb97697395b1f4e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 324 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 326 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..c1946ab55d4f44
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,324 @@
+From: =?utf-8?b?QmFsbMOzIEd5w7ZyZ3k=?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+Forwarded: https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/16
+Bug-Debian: https://bugs.debian.org/1092704
+---
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8716331..8772d52 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54d..4f99b24 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c..1728189 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 11 Jan 2025 14:48:46 -0500
+Subject: taglib-2 further fix
+
+Further fix compatibility with taglib 2.x on 32-bit architecture.
+---
+ src/tags/gio_wrapper.cc | 20 ++++++++++----------
+ src/tags/gio_wrapper.h | 20 ++++++++++----------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8772d52..8fdd9e7 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,7 +47,7 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (ulong len)
++GIO_InputStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -95,7 +95,7 @@ GIO_InputStream::isOpen () const
+ }
+
+ void
+-GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_InputStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -133,13 +133,13 @@ GIO_InputStream::clear ()
+ }
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::length ()
+ {
+ if (error)
+@@ -161,7 +161,7 @@ GIO_InputStream::length ()
+ }
+
+ void
+-GIO_InputStream::truncate (long int len)
++GIO_InputStream::truncate (TagLib::offset_t len)
+ {
+ g_warning ("%s", "Trying to truncate read-only file");
+ }
+@@ -200,7 +200,7 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (ulong len)
++GIO_IOStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -400,7 +400,7 @@ GIO_IOStream::isOpen () const
+ }
+
+ void
+-GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_IOStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -434,13 +434,13 @@ GIO_IOStream::clear ()
+ g_clear_error (&error);
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::length ()
+ {
+ long rv = -1;
+@@ -464,7 +464,7 @@ GIO_IOStream::length ()
+ }
+
+ void
+-GIO_IOStream::truncate (long int len)
++GIO_IOStream::truncate (TagLib::offset_t len)
+ {
+ if (error)
+ {
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index 4f99b24..fc634ab 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,17 +33,17 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+@@ -61,17 +61,17 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From cb7df6b46152eccdb38d482372ccfd29a410c545 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 5038040710f6377581e0981f9285099034197d97 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..1aea0e5f5b0496 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From 9b3e7fadf1db595b4f8de64829ff61ee408e42af Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 490f59d83829159b0830a13c5f0833f9caf6513f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 15/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From ef2f83aa8b48333917d61cabf5d89a23ed5ebef2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 16/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 5775dd2847238a28f23dc9c8acc1d24d8ed0d439 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 17/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 17d8605cebbf007bd742b1110feb582fa8b13e0d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 18/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 03f1ba8048710422c54f288accd77e2e99622648 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 19/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 000cad9d6c1e561427038452a9bd0ab6e91cdb16 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 20/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 8803f7021957cff498e4becf31a427eed668c452 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 21/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 9f19c9d63084d5982baf598e7f409b42f3d93869 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 22/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 32f080d5a8c7f1efe28ed4b7ff8e48ecc217d8ab Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 23/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 6a4553656f9e0cda88f38dfaff06be4e97cf16b8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 24/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From 614e810a7486c5acd38d87c8d9c5d1709cdc94ab Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 25/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 475bc938058f3470568ddfe16ee262361b594ab8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 26/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 206292f537ca3019278040ed4ade7ce1f2335a74 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 27/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From 51ffeff01c8969dd82b63884d160e1787547a4c2 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 28/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 94027cba413405073983c59053863d135ffee8d7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:01:13 +0100
Subject: [PATCH 29/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1bda568711478c..c11d62df6b03e6 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -314,6 +314,7 @@ replaces="
icecat-i18n-zh-CN<=78.6.1_1
icecat-i18n-zh-TW<=78.6.1_1
icecat<=78.6.1_1
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 33d06162aad41439a532e37d3838d2209845e29c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 30/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index e1d983a64f22e1..ebe5468228d8d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1233,8 +1233,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c11d62df6b03e6..23767d83a6b112 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -455,6 +455,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From e8275128b7098cd153f72359a1694efb38ba1e36 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 31/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 23767d83a6b112..4b553da9bb204b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -490,6 +490,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From cbc020b81fb3adb341ec70ca99606f3f1872620a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 32/41] ncmpcpp: update to 0.10.1, use taglib2
---
srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ----------------
srcpkgs/ncmpcpp/template | 20 ++++++++++----------
2 files changed, 10 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/ncmpcpp/patches/socket-inode.patch
diff --git a/srcpkgs/ncmpcpp/patches/socket-inode.patch b/srcpkgs/ncmpcpp/patches/socket-inode.patch
deleted file mode 100644
index 6bf92146ea0914..00000000000000
--- a/srcpkgs/ncmpcpp/patches/socket-inode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Support sockets without a socket inode
-# https://github.com/ncmpcpp/ncmpcpp/commit/40e4f98ee896ea10967eb1c4323bb718331eabea
-diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
-index ccdee31d..9a92e5df 100644
---- a/src/mpdpp.cpp
-+++ b/src/mpdpp.cpp
-@@ -147,7 +147,7 @@ unsigned Connection::Version() const
- void Connection::SetHostname(const std::string &host)
- {
- size_t at = host.find("@");
-- if (at != std::string::npos)
-+ if (at != 0 && at != std::string::npos)
- {
- m_password = host.substr(0, at);
- m_host = host.substr(at+1);
-
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..b0fba7f09df2a8 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,25 +1,25 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
-version=0.9.2
-revision=11
+version=0.10.1
+revision=1
build_style=gnu-configure
-configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
-hostmakedepends="pkg-config"
-makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+configure_args=" --enable-clock --enable-outputs --enable-unicode
+ --enable-visualizer --with-curl --with-taglib --with-fftw"
+hostmakedepends="automake libtool pkg-config"
+makedepends="boost-devel fftw-devel icu-devel libcurl-devel libltdl-devel
+ libmpdclient-devel readline-devel taglib-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://rybczak.net/ncmpcpp"
-distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
+distfiles="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${version}.tar.gz"
+checksum=ddc89da86595d272282ae8726cc7913867b9517eec6e765e66e6da860b58e2f9
# Required by waddwstr() with ncurses on musl
CXXFLAGS="-D_XOPEN_SOURCE=600"
pre_configure() {
- vsed -e '/^docdir/d' -i {,doc/}Makefile.in
+ autoreconf -fiv
}
post_install() {
From 26665f69e893dfd85a4f4e156133a7a02fb89153 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 33/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From ffab4fda5adbd153b1b925427b2b5afa1170276e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 34/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 1 +
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 4b553da9bb204b..f53d802ff77f51 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -827,6 +827,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From c48568d52573d647ff65c622de356865d54a2336 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 35/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From c6d448a632f15cdeaebbdfe6087034c1f3d4d005 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 36/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 08942e0055dac6c7fd494b8e4b24780fcbe0c636 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 37/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 52cd5a775bcad521d86798fd2cc1757c372f5584 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 38/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 27f1d634d50c00b5518a57c5d77324ac0bbfb44a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 39/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 97e8050343cba43e90ca8f5d0aa7a7e350fa3c67 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 19 Mar 2025 14:47:49 +0100
Subject: [PATCH 40/41] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=3
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
From 2528c98ce0ff1b457d607b1e40a7d0258b79dc8c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Mar 2025 14:15:46 +0100
Subject: [PATCH 41/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 34024aff716797..dadf10f47925fa 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.11
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (52 preceding siblings ...)
2025-03-27 10:06 ` slymattz
@ 2025-04-06 14:50 ` slymattz
2025-04-06 15:21 ` slymattz
` (41 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-04-06 14:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5640 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Motivation for upgrading taglib
[https://taglib.org/older.html](https://taglib.org/older.html):
> New major version, binary incompatible, but mostly source-compatible with the latest 1.x release if no deprecated features are used. Simple applications should build without changes, more complex applications (e.g. extending classes of TagLib) will have to be adapted.
I believe more complex applications will soon/already do require taglib2. Other distros typically have both packages: taglib1 and taglib. For now, a little patching is needed but I bet future releases of "more complex applications" will use taglib2 by default as it's been around for ca. 1.5 years. Taglib1 no longer receives updates and it would be needed for just a handful of apps (see removed apps below), so I'm not sure if taglib1 would make sense in Void, especially because of alternative packages available in the repo which serve the purpose.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
EDIT 3/19/25: resolved a base conflict (updated kodi to 21.2 as 21.1 wouldn't build for i686).
EDIT 3/26/25: resolve a gst-plugins-good1 conflict
[ci skip]
#### About removed packages:
- loudgain: could be replaced with rsgain (not packaged in Void at this time.) This works, though:
```
# Template file for 'rsgain'
pkgname=rsgain
version=3.6
revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="ffmpeg-devel fmt-devel taglib-devel libebur128-devel inih-devel"
short_desc="Simple, but powerful ReplayGain 2.0 tagging utility"
maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/complexlogic/rsgain"
distfiles="https://github.com/complexlogic/rsgain/archive/refs/tags/v${version}.tar.gz"
checksum=26f7acd1ba0851929dc756c93b3b1a6d66d7f2f36b31f744c8181f14d7b5c8a7
post_install() {
vlicense LICENSE
vlicense LICENSE-CRCpp
}
```
- id3ted: there are plenty of alternatives, be it GUI-based or CLI. In the repo there's kid3, picard or puddletag, for instance.
- libtaginfo: there are alternatives like python3-mutagen or ffmpeg etc.
- soundkonverter: could be replaced with other GUI converters such as k3b, clementine or asunder to name a few.
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
#### Testing individual packages:
- [x] ario
- [x] moc: mocp launches, media tags work
- [x] parole: launches, media tags work
- [x] pragha: launches, media tags work
- [x] thunar-media-tags-plugin: editing tags in thunar works
- [x] QMPlay2: launches, media tags work
- [x] ardour: launches, allows for the editing of metadata
- [x] clementine: launches, media tags work
- [x] easytag: launches, media tags work
- [x] flacon: launches, media tags work
- [x] gerbera: update to 2.5.0 - works well, I use it on a daily basis
- [x] gogglesmm: launches, media tags work
- [x] k3b: launches and works fine
- [x] vlc: launches, media tags work
- [x] kfilemetadata5: I guess it works. I'm not sure how to test it.
- [x] kid3: launches, media tags work
- [x] krename: launches, media tags work
- [x] lms: works
- [x] mixxx: update to 2.5.0: launches, media tags work
- [x] mp3unicode: launches
- [x] musikcube: launches, media tags work
- [x] qmmp: update to 1.7.3: launches, media tags work
- [x] quimup: update to 2.1.1: launches fine
- [x] strawberry: update to 1.2.7 - works well, I use it on a daily basis
- [x] tellico: launches
- [x] vimpc: launches, requires mpd
- [x] ncmpcpp: launches, requires mpd
- [x] kasts: launches
- [x] juk: launches, media tags work
- [x] kf6-kfilemetadata: media tags show under properties of a media file
- [x] kodi: launches, media tags work
- [x] gst-plugins-good1: works
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 85169 bytes --]
From 5d662dcec21477e7945ed7c6ab5a426f5dc4af97 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a51d54d5472096..24557ce39be7d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From fe20747ed5080c3b20acc75117f84ecdae50b826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From f52739cf432e3e48b3f78d930ab9f4c17f76ffec Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 0b3534c785a6afc59fcc16039154d094606d1035 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 51d37965aac3ff8848326fa9f8a566181ef4680d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 93026bbfe3019c5a820f00ec58ebb9c5c0a01433 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From d5ec9cc91e11f4bd6296858fd1ff4c0ebe6117a6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 1c712d54abad5c1690c1f96b9388b0e28fae57f7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From 0efe33bed727ff0d581065db457c722c83138d70 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From 91c08e5a6c80a4c92cec481675b3804bb1bd457d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 8060f78c3937543f8912a0c99ff68b563eaf78cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 324 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 326 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..c1946ab55d4f44
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,324 @@
+From: =?utf-8?b?QmFsbMOzIEd5w7ZyZ3k=?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+Forwarded: https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/16
+Bug-Debian: https://bugs.debian.org/1092704
+---
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8716331..8772d52 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54d..4f99b24 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c..1728189 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 11 Jan 2025 14:48:46 -0500
+Subject: taglib-2 further fix
+
+Further fix compatibility with taglib 2.x on 32-bit architecture.
+---
+ src/tags/gio_wrapper.cc | 20 ++++++++++----------
+ src/tags/gio_wrapper.h | 20 ++++++++++----------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8772d52..8fdd9e7 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,7 +47,7 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (ulong len)
++GIO_InputStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -95,7 +95,7 @@ GIO_InputStream::isOpen () const
+ }
+
+ void
+-GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_InputStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -133,13 +133,13 @@ GIO_InputStream::clear ()
+ }
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::length ()
+ {
+ if (error)
+@@ -161,7 +161,7 @@ GIO_InputStream::length ()
+ }
+
+ void
+-GIO_InputStream::truncate (long int len)
++GIO_InputStream::truncate (TagLib::offset_t len)
+ {
+ g_warning ("%s", "Trying to truncate read-only file");
+ }
+@@ -200,7 +200,7 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (ulong len)
++GIO_IOStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -400,7 +400,7 @@ GIO_IOStream::isOpen () const
+ }
+
+ void
+-GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_IOStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -434,13 +434,13 @@ GIO_IOStream::clear ()
+ g_clear_error (&error);
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::length ()
+ {
+ long rv = -1;
+@@ -464,7 +464,7 @@ GIO_IOStream::length ()
+ }
+
+ void
+-GIO_IOStream::truncate (long int len)
++GIO_IOStream::truncate (TagLib::offset_t len)
+ {
+ if (error)
+ {
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index 4f99b24..fc634ab 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,17 +33,17 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+@@ -61,17 +61,17 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From dce2a46a7dee566f93506b350d69772a290ad6af Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 5f86bc5d51a2ff00c73046bdb06b083b40d4938f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..1aea0e5f5b0496 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,20 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
# libupnp uses large file support, so users must do that, too
CXXFLAGS="-D_FILE_OFFSET_BITS=64"
From e222fdd8cbbe9d24c6bbb9ff50c03dc66e0a0e8a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From ba0a5a97a80e178b907c466ed9817c3361a544ab Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 15/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 14cf6ecb8d78eb94b5780152e820df697c36e09a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 16/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 7ae43973c0c13d701136382709548dd27121833e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 17/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From 93be2ac9caf7017e8389d5cc0014293c9f71e521 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 18/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 491fa7a4a3a72292832ecab2f4bd063aad6445da Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 19/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 400a2fb8e6a8576bcd0ceb8f3c9eca2866a373c8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 20/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 91b35bf98f41f43fd7aa657ff3f0fd38fba33064 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 21/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 5890867267bc2ba1a429a93f49e39d00e78d1979 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 22/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From bfe0ef33cf10dd7cca83daec5c6e9ab8f3b3115c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 23/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From eae6ec4e1c24c9b34173760408e85e04e1beced1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 24/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From 62e98f7bdec2960124745345743e9c1f4446889b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 25/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From a6314782d97b0c1cca304125a1ca07ca3951f90a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 26/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From 0e588d4d3dc154ee4822f15ba79a4def5b78c48b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 27/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From bd57aac4eb1ee9afd9311e20ca25c29a27a790dc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 28/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 78eef82dc6e1a76d51669cb28065346803d3c277 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 29/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 24557ce39be7d9..ecc8efcac66412 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1233,8 +1233,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 470582d364c76f..a4ea7cf18724e9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -456,6 +456,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From 4ccac1f70650f3c1353bff2702ef25dc1a4d1311 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 30/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4ea7cf18724e9..da70c585142173 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -491,6 +491,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 0401a8d9fed667251096a71b4937f28efe114e3a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 31/41] ncmpcpp: update to 0.10.1, use taglib2
---
srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ----------------
srcpkgs/ncmpcpp/template | 20 ++++++++++----------
2 files changed, 10 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/ncmpcpp/patches/socket-inode.patch
diff --git a/srcpkgs/ncmpcpp/patches/socket-inode.patch b/srcpkgs/ncmpcpp/patches/socket-inode.patch
deleted file mode 100644
index 6bf92146ea0914..00000000000000
--- a/srcpkgs/ncmpcpp/patches/socket-inode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Support sockets without a socket inode
-# https://github.com/ncmpcpp/ncmpcpp/commit/40e4f98ee896ea10967eb1c4323bb718331eabea
-diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
-index ccdee31d..9a92e5df 100644
---- a/src/mpdpp.cpp
-+++ b/src/mpdpp.cpp
-@@ -147,7 +147,7 @@ unsigned Connection::Version() const
- void Connection::SetHostname(const std::string &host)
- {
- size_t at = host.find("@");
-- if (at != std::string::npos)
-+ if (at != 0 && at != std::string::npos)
- {
- m_password = host.substr(0, at);
- m_host = host.substr(at+1);
-
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..b0fba7f09df2a8 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,25 +1,25 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
-version=0.9.2
-revision=11
+version=0.10.1
+revision=1
build_style=gnu-configure
-configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
-hostmakedepends="pkg-config"
-makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+configure_args=" --enable-clock --enable-outputs --enable-unicode
+ --enable-visualizer --with-curl --with-taglib --with-fftw"
+hostmakedepends="automake libtool pkg-config"
+makedepends="boost-devel fftw-devel icu-devel libcurl-devel libltdl-devel
+ libmpdclient-devel readline-devel taglib-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://rybczak.net/ncmpcpp"
-distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
+distfiles="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${version}.tar.gz"
+checksum=ddc89da86595d272282ae8726cc7913867b9517eec6e765e66e6da860b58e2f9
# Required by waddwstr() with ncurses on musl
CXXFLAGS="-D_XOPEN_SOURCE=600"
pre_configure() {
- vsed -e '/^docdir/d' -i {,doc/}Makefile.in
+ autoreconf -fiv
}
post_install() {
From 9ce392c9b2937687ac66fd7a97e50100c2f07fea Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 32/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 214067df61944bd3a7cc24c07df99d9eb23040d8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 33/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 1 +
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index da70c585142173..d8c2a7954a9bb4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -828,6 +828,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 074df210fd50420e3f0da68b3e7497a8d37a8a6b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 34/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From 3d2a9d1c77cf74e5e6ae8adc6d47b8998c92433b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 35/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 4a628fd301deb77383c761928d9c3ee04b694740 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 36/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 488a2879ff22c816ef4019c3b5bde8f690414231 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 37/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 91373797dc79558e48dfbafbbeb0bd2a9f69b147 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 38/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 60fd725811724ab5459f62c44d74dd5b02d354ec Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 19 Mar 2025 14:47:49 +0100
Subject: [PATCH 39/41] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=3
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
From 31bacc9197b86d45ea376062343de28da50ff669 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Mar 2025 14:15:46 +0100
Subject: [PATCH 40/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 34024aff716797..dadf10f47925fa 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.11
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 2ed24842967e0dec0ed111f226a20f0ce0aea951 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 6 Apr 2025 16:50:13 +0200
Subject: [PATCH 41/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d8c2a7954a9bb4..50fe6d57088f70 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -316,6 +316,7 @@ replaces="
icecat<=78.6.1_1
icu4lua-devel<=0.2B_14
icu4lua<=0.2B_14
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (53 preceding siblings ...)
2025-04-06 14:50 ` slymattz
@ 2025-04-06 15:21 ` slymattz
2025-04-07 13:49 ` slymattz
` (40 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-04-06 15:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5690 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Motivation for upgrading taglib
[https://taglib.org/older.html](https://taglib.org/older.html):
> New major version, binary incompatible, but mostly source-compatible with the latest 1.x release if no deprecated features are used. Simple applications should build without changes, more complex applications (e.g. extending classes of TagLib) will have to be adapted.
I believe more complex applications will soon/already do require taglib2. Other distros typically have both packages: taglib1 and taglib. For now, a little patching is needed but I bet future releases of "more complex applications" will use taglib2 by default as it's been around for ca. 1.5 years. Taglib1 no longer receives updates and it would be needed for just a handful of apps (see removed apps below), so I'm not sure if taglib1 would make sense in Void, especially because of alternative packages available in the repo which serve the purpose.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
EDIT 3/19/25: resolved a base conflict (updated kodi to 21.2 as 21.1 wouldn't build for i686).
EDIT 3/26/25: resolve a gst-plugins-good1 conflict
EDIT 4/6/25: resolved a base conflict with removed-packages
#### About removed packages:
- loudgain: could be replaced with rsgain (not packaged in Void at this time.) This works, though:
```
# Template file for 'rsgain'
pkgname=rsgain
version=3.6
revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="ffmpeg-devel fmt-devel taglib-devel libebur128-devel inih-devel"
short_desc="Simple, but powerful ReplayGain 2.0 tagging utility"
maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/complexlogic/rsgain"
distfiles="https://github.com/complexlogic/rsgain/archive/refs/tags/v${version}.tar.gz"
checksum=26f7acd1ba0851929dc756c93b3b1a6d66d7f2f36b31f744c8181f14d7b5c8a7
post_install() {
vlicense LICENSE
vlicense LICENSE-CRCpp
}
```
- id3ted: there are plenty of alternatives, be it GUI-based or CLI. In the repo there's kid3, picard or puddletag, for instance.
- libtaginfo: there are alternatives like python3-mutagen or ffmpeg etc.
- soundkonverter: could be replaced with other GUI converters such as k3b, clementine or asunder to name a few.
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
#### Testing individual packages:
- [x] ario
- [x] moc: mocp launches, media tags work
- [x] parole: launches, media tags work
- [x] pragha: launches, media tags work
- [x] thunar-media-tags-plugin: editing tags in thunar works
- [x] QMPlay2: launches, media tags work
- [x] ardour: launches, allows for the editing of metadata
- [x] clementine: launches, media tags work
- [x] easytag: launches, media tags work
- [x] flacon: launches, media tags work
- [x] gerbera: update to 2.5.0 - works well, I use it on a daily basis
- [x] gogglesmm: launches, media tags work
- [x] k3b: launches and works fine
- [x] vlc: launches, media tags work
- [x] kfilemetadata5: I guess it works. I'm not sure how to test it.
- [x] kid3: launches, media tags work
- [x] krename: launches, media tags work
- [x] lms: works
- [x] mixxx: update to 2.5.0: launches, media tags work
- [x] mp3unicode: launches
- [x] musikcube: launches, media tags work
- [x] qmmp: update to 1.7.3: launches, media tags work
- [x] quimup: update to 2.1.1: launches fine
- [x] strawberry: update to 1.2.7 - works well, I use it on a daily basis
- [x] tellico: launches
- [x] vimpc: launches, requires mpd
- [x] ncmpcpp: launches, requires mpd
- [x] kasts: launches
- [x] juk: launches, media tags work
- [x] kf6-kfilemetadata: media tags show under properties of a media file
- [x] kodi: launches, media tags work
- [x] gst-plugins-good1: works
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 85405 bytes --]
From 5d662dcec21477e7945ed7c6ab5a426f5dc4af97 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a51d54d5472096..24557ce39be7d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From fe20747ed5080c3b20acc75117f84ecdae50b826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From f52739cf432e3e48b3f78d930ab9f4c17f76ffec Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 0b3534c785a6afc59fcc16039154d094606d1035 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 51d37965aac3ff8848326fa9f8a566181ef4680d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 93026bbfe3019c5a820f00ec58ebb9c5c0a01433 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From d5ec9cc91e11f4bd6296858fd1ff4c0ebe6117a6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 1c712d54abad5c1690c1f96b9388b0e28fae57f7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From 0efe33bed727ff0d581065db457c722c83138d70 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From 91c08e5a6c80a4c92cec481675b3804bb1bd457d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 8060f78c3937543f8912a0c99ff68b563eaf78cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 324 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 326 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..c1946ab55d4f44
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,324 @@
+From: =?utf-8?b?QmFsbMOzIEd5w7ZyZ3k=?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+Forwarded: https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/16
+Bug-Debian: https://bugs.debian.org/1092704
+---
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8716331..8772d52 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54d..4f99b24 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c..1728189 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 11 Jan 2025 14:48:46 -0500
+Subject: taglib-2 further fix
+
+Further fix compatibility with taglib 2.x on 32-bit architecture.
+---
+ src/tags/gio_wrapper.cc | 20 ++++++++++----------
+ src/tags/gio_wrapper.h | 20 ++++++++++----------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8772d52..8fdd9e7 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,7 +47,7 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (ulong len)
++GIO_InputStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -95,7 +95,7 @@ GIO_InputStream::isOpen () const
+ }
+
+ void
+-GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_InputStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -133,13 +133,13 @@ GIO_InputStream::clear ()
+ }
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::length ()
+ {
+ if (error)
+@@ -161,7 +161,7 @@ GIO_InputStream::length ()
+ }
+
+ void
+-GIO_InputStream::truncate (long int len)
++GIO_InputStream::truncate (TagLib::offset_t len)
+ {
+ g_warning ("%s", "Trying to truncate read-only file");
+ }
+@@ -200,7 +200,7 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (ulong len)
++GIO_IOStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -400,7 +400,7 @@ GIO_IOStream::isOpen () const
+ }
+
+ void
+-GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_IOStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -434,13 +434,13 @@ GIO_IOStream::clear ()
+ g_clear_error (&error);
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::length ()
+ {
+ long rv = -1;
+@@ -464,7 +464,7 @@ GIO_IOStream::length ()
+ }
+
+ void
+-GIO_IOStream::truncate (long int len)
++GIO_IOStream::truncate (TagLib::offset_t len)
+ {
+ if (error)
+ {
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index 4f99b24..fc634ab 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,17 +33,17 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+@@ -61,17 +61,17 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From dce2a46a7dee566f93506b350d69772a290ad6af Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 10f9e83de72f6504ff36a82012b7c504dd727d95 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..7bfbfb3ef4e905 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,24 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+configure_args="-DWITH_SYSTEMD=OFF -DWITH_AVCODEC=ON -DWITH_NPUPNP=ON"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
- libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ libexif-devel libnpupnp-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
-
-# libupnp uses large file support, so users must do that, too
-CXXFLAGS="-D_FILE_OFFSET_BITS=64"
-
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
system_accounts="gerbera"
make_dirs="/var/lib/gerbera 0750 gerbera gerbera"
From 8f71c0de0b7a868bab2d8d9027d4b579d577c80e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 7415bb90ff248a56d90c07d251276010a6c196e5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 15/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 8fd9ed0a13537592b4f3cbcbaa9df9ee9be64550 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 16/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From a66e4f8a842b9788ae7fb582dc1d67ae7f0775f8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 17/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From e5c9b39128ff7590fa0d9d531261d21ce54ba1f3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 18/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 9dc1edd689d5dea06badd0c16982bc984bb7bcfc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 19/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 9e9e18ee2231866a4ce3b9114342a8584c8dda8e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 20/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 2921f5a9eccd8ffcc748ae8e70669cc45c2c85a6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 21/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 1de4ad7c42b93bd19dd5eab57bb2d78d0d7a4216 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 22/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 5d5d19d1d92a6bd57a10799a5236c31112cddfa5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 23/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 49f865d006eb218fc3138f4d0e93d1472bdadbbd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 24/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From a1d040dd5bbbfb72e2bb4e6ba84f2cec13caf89d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 25/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 5d538ab28eefd105cb8aca22bd8b75c02cd83f43 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 26/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From b8aad536b686a04ab9688ce733addfd56bb557c8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 27/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From a1c8021e3195c553e4b6a5050bf3dfcb6d3005bc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 28/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 53b2fb2566b44ad8acfdf8377545a12faaf2a38e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 29/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 24557ce39be7d9..ecc8efcac66412 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1233,8 +1233,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 470582d364c76f..a4ea7cf18724e9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -456,6 +456,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From a6f74474246334fe3b64ef604f81575ee3b4395d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 30/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4ea7cf18724e9..da70c585142173 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -491,6 +491,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 3265a8bf17d62ae40ad4d3a1d05c8e90c67c5d15 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 31/41] ncmpcpp: update to 0.10.1, use taglib2
---
srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ----------------
srcpkgs/ncmpcpp/template | 20 ++++++++++----------
2 files changed, 10 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/ncmpcpp/patches/socket-inode.patch
diff --git a/srcpkgs/ncmpcpp/patches/socket-inode.patch b/srcpkgs/ncmpcpp/patches/socket-inode.patch
deleted file mode 100644
index 6bf92146ea0914..00000000000000
--- a/srcpkgs/ncmpcpp/patches/socket-inode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Support sockets without a socket inode
-# https://github.com/ncmpcpp/ncmpcpp/commit/40e4f98ee896ea10967eb1c4323bb718331eabea
-diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
-index ccdee31d..9a92e5df 100644
---- a/src/mpdpp.cpp
-+++ b/src/mpdpp.cpp
-@@ -147,7 +147,7 @@ unsigned Connection::Version() const
- void Connection::SetHostname(const std::string &host)
- {
- size_t at = host.find("@");
-- if (at != std::string::npos)
-+ if (at != 0 && at != std::string::npos)
- {
- m_password = host.substr(0, at);
- m_host = host.substr(at+1);
-
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..b0fba7f09df2a8 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,25 +1,25 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
-version=0.9.2
-revision=11
+version=0.10.1
+revision=1
build_style=gnu-configure
-configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
-hostmakedepends="pkg-config"
-makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+configure_args=" --enable-clock --enable-outputs --enable-unicode
+ --enable-visualizer --with-curl --with-taglib --with-fftw"
+hostmakedepends="automake libtool pkg-config"
+makedepends="boost-devel fftw-devel icu-devel libcurl-devel libltdl-devel
+ libmpdclient-devel readline-devel taglib-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://rybczak.net/ncmpcpp"
-distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
+distfiles="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${version}.tar.gz"
+checksum=ddc89da86595d272282ae8726cc7913867b9517eec6e765e66e6da860b58e2f9
# Required by waddwstr() with ncurses on musl
CXXFLAGS="-D_XOPEN_SOURCE=600"
pre_configure() {
- vsed -e '/^docdir/d' -i {,doc/}Makefile.in
+ autoreconf -fiv
}
post_install() {
From 8b979f24a3f26ac81cdb4a03a1a4af406d40d682 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 32/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From f0a9ef1db0c645a4c4f4704600a6ab31fe9b995a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:54:14 +0100
Subject: [PATCH 33/41] soundkonverter: remove package
repo archived since 2022; doesn't build with taglib2
---
srcpkgs/removed-packages/template | 1 +
srcpkgs/soundkonverter/template | 20 --------------------
2 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 srcpkgs/soundkonverter/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index da70c585142173..d8c2a7954a9bb4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -828,6 +828,7 @@ replaces="
skypetab-ng<=20150201_3
slmenu<=0.1_1
soulseekqt<=20160117_2
+ soundkonverter<=3.0.1_2
spacefm-ng<=1.0.6_3
spotify-adblock-linux<=1.1_1
sqlite-replication<=3.32.3_2
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
deleted file mode 100644
index e11cd96426472b..00000000000000
--- a/srcpkgs/soundkonverter/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'soundkonverter'
-pkgname=soundkonverter
-version=3.0.1
-revision=2
-build_wrksrc=src
-build_style=cmake
-configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
-hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-qmake
- qt5-host-tools pkg-config"
-makedepends="kdelibs4support-devel libcdparanoia-devel libkcddb-devel
- qt5-devel taglib-devel ksolid-devel"
-depends="hicolor-icon-theme"
-short_desc="Frontend to various audio converters"
-maintainer="travankor <travankor@tuta.io>"
-license="GPL-2.0-only"
-homepage="https://github.com/dfaust/soundkonverter"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce
-
-CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/taglib"
From 45e5bae0a3475b591728d30ef18a0d6ea4ef61c9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 34/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From 870a5eea1fe5f174cf5adcdc33b7e2b11a0c49b0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 35/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From f6501d0008a8169e5801da022dcb6d3836c98e5b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 36/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 3ad38d6bd0a140575e3bbe2499788a6b3504feec Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 37/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From af3ccaeea7e172bc07af71a8f9d801f0023b4add Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 38/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From f5cff17da8823b18b8a1aada5e679eb7d7890643 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 19 Mar 2025 14:47:49 +0100
Subject: [PATCH 39/41] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=3
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
From cd11cbdf3d27ac61ed047b8325da0d4068db96c6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Mar 2025 14:15:46 +0100
Subject: [PATCH 40/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 34024aff716797..dadf10f47925fa 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.11
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 2a2e88ad84b1d12d41a8fe2058bb028774d77005 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 6 Apr 2025 16:50:13 +0200
Subject: [PATCH 41/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d8c2a7954a9bb4..50fe6d57088f70 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -316,6 +316,7 @@ replaces="
icecat<=78.6.1_1
icu4lua-devel<=0.2B_14
icu4lua<=0.2B_14
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (54 preceding siblings ...)
2025-04-06 15:21 ` slymattz
@ 2025-04-07 13:49 ` slymattz
2025-04-07 14:16 ` slymattz
` (39 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-04-07 13:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5876 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Motivation for upgrading taglib
[https://taglib.org/older.html](https://taglib.org/older.html):
> New major version, binary incompatible, but mostly source-compatible with the latest 1.x release if no deprecated features are used. Simple applications should build without changes, more complex applications (e.g. extending classes of TagLib) will have to be adapted.
I believe more complex applications will soon/already do require taglib2. Other distros typically have both packages: taglib1 and taglib. For now, a little patching is needed but I bet future releases of "more complex applications" will use taglib2 by default as it's been around for ca. 1.5 years. Taglib1 no longer receives updates and it would be needed for just a handful of apps (see removed apps below), so I'm not sure if taglib1 would make sense in Void, especially because of alternative packages available in the repo which serve the purpose.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
EDIT 3/19/25: resolved a base conflict (updated kodi to 21.2 as 21.1 wouldn't build for i686).
EDIT 3/26/25: resolve a gst-plugins-good1 conflict
EDIT 4/6/25: resolved a base conflict with removed-packages and added the `-DWITH_NPUPNP=ON` flag to gerbera
#### About removed packages:
- loudgain: could be replaced with rsgain (not packaged in Void at this time.) This works, though:
```
# Template file for 'rsgain'
pkgname=rsgain
version=3.6
revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="ffmpeg-devel fmt-devel taglib-devel libebur128-devel inih-devel"
short_desc="Simple, but powerful ReplayGain 2.0 tagging utility"
maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/complexlogic/rsgain"
distfiles="https://github.com/complexlogic/rsgain/archive/refs/tags/v${version}.tar.gz"
checksum=26f7acd1ba0851929dc756c93b3b1a6d66d7f2f36b31f744c8181f14d7b5c8a7
post_install() {
vlicense LICENSE
vlicense LICENSE-CRCpp
}
```
- id3ted: there are plenty of alternatives, be it GUI-based or CLI. In the repo there's kid3, picard or puddletag, for instance.
- libtaginfo: there are alternatives like python3-mutagen or ffmpeg etc.
- soundkonverter: could be replaced with other GUI converters such as k3b, clementine or asunder to name a few. However, I'm testing [this patch](https://github.com/nphantasm/soundkonverter/commit/dd52d33046cf740415f8507a3ffd5b37dffc5a2c.diff) now
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
#### Testing individual packages:
- [x] ario
- [x] moc: mocp launches, media tags work
- [x] parole: launches, media tags work
- [x] pragha: launches, media tags work
- [x] thunar-media-tags-plugin: editing tags in thunar works
- [x] QMPlay2: launches, media tags work
- [x] ardour: launches, allows for the editing of metadata
- [x] clementine: launches, media tags work
- [x] easytag: launches, media tags work
- [x] flacon: launches, media tags work
- [x] gerbera: update to 2.5.0 - works well, I use it on a daily basis
- [x] gogglesmm: launches, media tags work
- [x] k3b: launches and works fine
- [x] vlc: launches, media tags work
- [x] kfilemetadata5: I guess it works. I'm not sure how to test it.
- [x] kid3: launches, media tags work
- [x] krename: launches, media tags work
- [x] lms: works
- [x] mixxx: update to 2.5.0: launches, media tags work
- [x] mp3unicode: launches
- [x] musikcube: launches, media tags work
- [x] qmmp: update to 1.7.3: launches, media tags work
- [x] quimup: update to 2.1.1: launches fine
- [x] strawberry: update to 1.2.7 - works well, I use it on a daily basis
- [x] tellico: launches
- [x] vimpc: launches, requires mpd
- [x] ncmpcpp: launches, requires mpd
- [x] kasts: launches
- [x] juk: launches, media tags work
- [x] kf6-kfilemetadata: media tags show under properties of a media file
- [x] kodi: launches, media tags work
- [x] gst-plugins-good1: works
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 100164 bytes --]
From 5d662dcec21477e7945ed7c6ab5a426f5dc4af97 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a51d54d5472096..24557ce39be7d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From fe20747ed5080c3b20acc75117f84ecdae50b826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From f52739cf432e3e48b3f78d930ab9f4c17f76ffec Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 0b3534c785a6afc59fcc16039154d094606d1035 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 51d37965aac3ff8848326fa9f8a566181ef4680d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 93026bbfe3019c5a820f00ec58ebb9c5c0a01433 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From d5ec9cc91e11f4bd6296858fd1ff4c0ebe6117a6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 1c712d54abad5c1690c1f96b9388b0e28fae57f7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From 0efe33bed727ff0d581065db457c722c83138d70 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From 91c08e5a6c80a4c92cec481675b3804bb1bd457d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 8060f78c3937543f8912a0c99ff68b563eaf78cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 324 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 326 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..c1946ab55d4f44
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,324 @@
+From: =?utf-8?b?QmFsbMOzIEd5w7ZyZ3k=?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+Forwarded: https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/16
+Bug-Debian: https://bugs.debian.org/1092704
+---
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8716331..8772d52 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54d..4f99b24 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c..1728189 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 11 Jan 2025 14:48:46 -0500
+Subject: taglib-2 further fix
+
+Further fix compatibility with taglib 2.x on 32-bit architecture.
+---
+ src/tags/gio_wrapper.cc | 20 ++++++++++----------
+ src/tags/gio_wrapper.h | 20 ++++++++++----------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8772d52..8fdd9e7 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,7 +47,7 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (ulong len)
++GIO_InputStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -95,7 +95,7 @@ GIO_InputStream::isOpen () const
+ }
+
+ void
+-GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_InputStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -133,13 +133,13 @@ GIO_InputStream::clear ()
+ }
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::length ()
+ {
+ if (error)
+@@ -161,7 +161,7 @@ GIO_InputStream::length ()
+ }
+
+ void
+-GIO_InputStream::truncate (long int len)
++GIO_InputStream::truncate (TagLib::offset_t len)
+ {
+ g_warning ("%s", "Trying to truncate read-only file");
+ }
+@@ -200,7 +200,7 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (ulong len)
++GIO_IOStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -400,7 +400,7 @@ GIO_IOStream::isOpen () const
+ }
+
+ void
+-GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_IOStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -434,13 +434,13 @@ GIO_IOStream::clear ()
+ g_clear_error (&error);
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::length ()
+ {
+ long rv = -1;
+@@ -464,7 +464,7 @@ GIO_IOStream::length ()
+ }
+
+ void
+-GIO_IOStream::truncate (long int len)
++GIO_IOStream::truncate (TagLib::offset_t len)
+ {
+ if (error)
+ {
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index 4f99b24..fc634ab 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,17 +33,17 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+@@ -61,17 +61,17 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From dce2a46a7dee566f93506b350d69772a290ad6af Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 10f9e83de72f6504ff36a82012b7c504dd727d95 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..7bfbfb3ef4e905 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,24 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+configure_args="-DWITH_SYSTEMD=OFF -DWITH_AVCODEC=ON -DWITH_NPUPNP=ON"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
- libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ libexif-devel libnpupnp-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
-
-# libupnp uses large file support, so users must do that, too
-CXXFLAGS="-D_FILE_OFFSET_BITS=64"
-
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
system_accounts="gerbera"
make_dirs="/var/lib/gerbera 0750 gerbera gerbera"
From 8f71c0de0b7a868bab2d8d9027d4b579d577c80e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 7415bb90ff248a56d90c07d251276010a6c196e5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 15/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 8fd9ed0a13537592b4f3cbcbaa9df9ee9be64550 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 16/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From a66e4f8a842b9788ae7fb582dc1d67ae7f0775f8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 17/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From e5c9b39128ff7590fa0d9d531261d21ce54ba1f3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 18/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 9dc1edd689d5dea06badd0c16982bc984bb7bcfc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 19/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 9e9e18ee2231866a4ce3b9114342a8584c8dda8e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 20/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 2921f5a9eccd8ffcc748ae8e70669cc45c2c85a6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 21/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 1de4ad7c42b93bd19dd5eab57bb2d78d0d7a4216 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 22/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 5d5d19d1d92a6bd57a10799a5236c31112cddfa5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 23/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 49f865d006eb218fc3138f4d0e93d1472bdadbbd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 24/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From a1d040dd5bbbfb72e2bb4e6ba84f2cec13caf89d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 25/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 5d538ab28eefd105cb8aca22bd8b75c02cd83f43 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 26/41] strawberry: update to 1.2.7
---
srcpkgs/strawberry/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..6dbc89aa6cc456 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.7
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,8 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +17,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=3411878ce1937fc5161ed9cffe25591c228035b6918d383bd26f73d12eed799a
From b8aad536b686a04ab9688ce733addfd56bb557c8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 27/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From a1c8021e3195c553e4b6a5050bf3dfcb6d3005bc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 28/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 53b2fb2566b44ad8acfdf8377545a12faaf2a38e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 29/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 24557ce39be7d9..ecc8efcac66412 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1233,8 +1233,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 470582d364c76f..a4ea7cf18724e9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -456,6 +456,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From a6f74474246334fe3b64ef604f81575ee3b4395d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 30/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4ea7cf18724e9..da70c585142173 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -491,6 +491,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 3265a8bf17d62ae40ad4d3a1d05c8e90c67c5d15 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 31/41] ncmpcpp: update to 0.10.1, use taglib2
---
srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ----------------
srcpkgs/ncmpcpp/template | 20 ++++++++++----------
2 files changed, 10 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/ncmpcpp/patches/socket-inode.patch
diff --git a/srcpkgs/ncmpcpp/patches/socket-inode.patch b/srcpkgs/ncmpcpp/patches/socket-inode.patch
deleted file mode 100644
index 6bf92146ea0914..00000000000000
--- a/srcpkgs/ncmpcpp/patches/socket-inode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Support sockets without a socket inode
-# https://github.com/ncmpcpp/ncmpcpp/commit/40e4f98ee896ea10967eb1c4323bb718331eabea
-diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
-index ccdee31d..9a92e5df 100644
---- a/src/mpdpp.cpp
-+++ b/src/mpdpp.cpp
-@@ -147,7 +147,7 @@ unsigned Connection::Version() const
- void Connection::SetHostname(const std::string &host)
- {
- size_t at = host.find("@");
-- if (at != std::string::npos)
-+ if (at != 0 && at != std::string::npos)
- {
- m_password = host.substr(0, at);
- m_host = host.substr(at+1);
-
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..b0fba7f09df2a8 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,25 +1,25 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
-version=0.9.2
-revision=11
+version=0.10.1
+revision=1
build_style=gnu-configure
-configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
-hostmakedepends="pkg-config"
-makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+configure_args=" --enable-clock --enable-outputs --enable-unicode
+ --enable-visualizer --with-curl --with-taglib --with-fftw"
+hostmakedepends="automake libtool pkg-config"
+makedepends="boost-devel fftw-devel icu-devel libcurl-devel libltdl-devel
+ libmpdclient-devel readline-devel taglib-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://rybczak.net/ncmpcpp"
-distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
+distfiles="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${version}.tar.gz"
+checksum=ddc89da86595d272282ae8726cc7913867b9517eec6e765e66e6da860b58e2f9
# Required by waddwstr() with ncurses on musl
CXXFLAGS="-D_XOPEN_SOURCE=600"
pre_configure() {
- vsed -e '/^docdir/d' -i {,doc/}Makefile.in
+ autoreconf -fiv
}
post_install() {
From 8b979f24a3f26ac81cdb4a03a1a4af406d40d682 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 32/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From a7d40308d56e422114810116a88532a453000947 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 33/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From 9e2218c6fd50cec2c78b1e40f1f0126221d1b078 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 34/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From b9eb30647a524136fcd4ca25facd14d917aceea5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 35/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From deae2f6583ad11ebfffb3f51e3d7914e5a1977eb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 36/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 7b64d38825f0c4d289153d48a0285968119d764c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 37/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From c131924b32734cd6acdb18acb723fc3fbf70918e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 19 Mar 2025 14:47:49 +0100
Subject: [PATCH 38/41] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=3
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
From 7dead65162f20ec41c9e632bcc60e9ee3150430e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Mar 2025 14:15:46 +0100
Subject: [PATCH 39/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 34024aff716797..dadf10f47925fa 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.11
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From ecf8794b141d832a44746fdef0ef9fe4e09deb53 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 6 Apr 2025 16:50:13 +0200
Subject: [PATCH 40/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index da70c585142173..9de13a00ad5288 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -316,6 +316,7 @@ replaces="
icecat<=78.6.1_1
icu4lua-devel<=0.2B_14
icu4lua<=0.2B_14
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 576e5093b2d02121a98e0431d4398a5831dec096 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 7 Apr 2025 15:48:03 +0200
Subject: [PATCH 41/41] soundkonverter: patch for taglib2
---
srcpkgs/soundkonverter/patches/taglib2.diff | 259 ++++++++++++++++++++
srcpkgs/soundkonverter/template | 2 +-
2 files changed, 260 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/soundkonverter/patches/taglib2.diff
diff --git a/srcpkgs/soundkonverter/patches/taglib2.diff b/srcpkgs/soundkonverter/patches/taglib2.diff
new file mode 100644
index 00000000000000..6e24af2ec99250
--- /dev/null
+++ b/srcpkgs/soundkonverter/patches/taglib2.diff
@@ -0,0 +1,259 @@
+diff --git a/src/metadata/tagengine.cpp b/src/metadata/tagengine.cpp
+index 4056d676..0aa48b26 100644
+--- a/src/metadata/tagengine.cpp
++++ b/src/metadata/tagengine.cpp
+@@ -367,8 +367,8 @@ TagData* TagEngine::readTags( const KUrl& fileName )
+
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "aART" )
+ {
+@@ -680,7 +680,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -688,7 +688,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -698,7 +698,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -711,7 +711,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -721,7 +721,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -734,7 +734,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -742,7 +742,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -755,7 +755,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -763,7 +763,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -773,7 +773,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -786,7 +786,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -796,7 +796,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -809,7 +809,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -817,7 +817,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -830,7 +830,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -838,7 +838,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -848,7 +848,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -861,7 +861,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -871,7 +871,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -884,7 +884,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -892,7 +892,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -903,27 +903,27 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+ if( !tagData->albumArtist.isEmpty() )
+- tag->itemListMap()["aART"] = TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("aART", TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->composer.isEmpty() )
+- tag->itemListMap()["\xA9wrt"] = TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("\xA9wrt", TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( tagData->trackTotal > 0 )
+- tag->itemListMap()["trkn"] = TagLib::MP4::Item( tagData->track, tagData->trackTotal );
++ tag->setItem("trkn", TagLib::MP4::Item( tagData->track, tagData->trackTotal ));
+
+ if( tagData->disc > 0 )
+ {
+ if( tagData->discTotal > 0 )
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc, tagData->discTotal );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc, tagData->discTotal ));
+ else
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc ));
+ }
+
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Track Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Track Id", TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Album Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Album Id", TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8)));
+ }
+ }
+ else if( TagLib::ASF::File *file = dynamic_cast<TagLib::ASF::File*>(fileref.file()) )
+@@ -1136,8 +1136,8 @@ QList<CoverData*> TagEngine::readCovers( const KUrl& fileName )
+ {
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "covr" )
+ {
+@@ -1290,7 +1290,7 @@ bool TagEngine::writeCovers( const KUrl& fileName, QList<CoverData*> covers )
+
+ coversList.append( TagLib::MP4::CoverArt( format, TagLib::ByteVector( cover->data.data(), cover->data.size() ) ) );
+ }
+- tag->itemListMap()["covr"] = TagLib::MP4::Item( coversList );
++ tag->setItem("covr", TagLib::MP4::Item( coversList ));
+ }
+
+ return fileref.save();
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
index e11cd96426472b..f31ba5a0c158a0 100644
--- a/srcpkgs/soundkonverter/template
+++ b/srcpkgs/soundkonverter/template
@@ -1,7 +1,7 @@
# Template file for 'soundkonverter'
pkgname=soundkonverter
version=3.0.1
-revision=2
+revision=3
build_wrksrc=src
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (55 preceding siblings ...)
2025-04-07 13:49 ` slymattz
@ 2025-04-07 14:16 ` slymattz
2025-04-16 20:17 ` slymattz
` (38 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-04-07 14:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5808 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Motivation for upgrading taglib
[https://taglib.org/older.html](https://taglib.org/older.html):
> New major version, binary incompatible, but mostly source-compatible with the latest 1.x release if no deprecated features are used. Simple applications should build without changes, more complex applications (e.g. extending classes of TagLib) will have to be adapted.
I believe more complex applications will soon/already do require taglib2. Other distros typically have both packages: taglib1 and taglib. For now, a little patching is needed but I bet future releases of "more complex applications" will use taglib2 by default as it's been around for ca. 1.5 years. Taglib1 no longer receives updates and it would be needed for just a handful of apps (see removed apps below), so I'm not sure if taglib1 would make sense in Void, especially because of alternative packages available in the repo which serve the purpose.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
EDIT 3/19/25: resolved a base conflict (updated kodi to 21.2 as 21.1 wouldn't build for i686).
EDIT 3/26/25: resolve a gst-plugins-good1 conflict
EDIT 4/6/25: resolved a base conflict with removed-packages and added the `-DWITH_NPUPNP=ON` flag to gerbera
EDIT: 4/7/25: applied a patch to soundkonverter for compatibility with taglib2
#### About removed packages:
1. loudgain: soundkonverter is said to do ReplayGain calculations. Alternatively, loudgain could be replaced with rsgain (not packaged in Void at this time.) This works:
```
# Template file for 'rsgain'
pkgname=rsgain
version=3.6
revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="ffmpeg-devel fmt-devel taglib-devel libebur128-devel inih-devel"
short_desc="Simple, but powerful ReplayGain 2.0 tagging utility"
maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/complexlogic/rsgain"
distfiles="https://github.com/complexlogic/rsgain/archive/refs/tags/v${version}.tar.gz"
checksum=26f7acd1ba0851929dc756c93b3b1a6d66d7f2f36b31f744c8181f14d7b5c8a7
post_install() {
vlicense LICENSE
vlicense LICENSE-CRCpp
}
```
2. id3ted: there are plenty of alternatives, be it GUI-based or CLI. In the repo there's kid3, picard or puddletag, for instance.
3. libtaginfo: there are alternatives like python3-mutagen or ffmpeg etc.
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
#### Testing individual packages:
- [x] ario
- [x] moc: mocp launches, media tags work
- [x] parole: launches, media tags work
- [x] pragha: launches, media tags work
- [x] thunar-media-tags-plugin: editing tags in thunar works
- [x] QMPlay2: launches, media tags work
- [x] ardour: launches, allows for the editing of metadata
- [x] clementine: launches, media tags work
- [x] easytag: launches, media tags work
- [x] flacon: launches, media tags work
- [x] gerbera: update to 2.5.0 - works well, I use it on a daily basis
- [x] gogglesmm: launches, media tags work
- [x] k3b: launches and works fine
- [x] vlc: launches, media tags work
- [x] kfilemetadata5: I guess it works. I'm not sure how to test it.
- [x] kid3: launches, media tags work
- [x] krename: launches, media tags work
- [x] lms: works
- [x] mixxx: update to 2.5.0: launches, media tags work
- [x] mp3unicode: launches
- [x] musikcube: launches, media tags work
- [x] qmmp: update to 1.7.3: launches, media tags work
- [x] quimup: update to 2.1.1: launches fine
- [x] strawberry: update to 1.2.7 - works well, I use it on a daily basis
- [x] tellico: launches
- [x] vimpc: launches, requires mpd
- [x] ncmpcpp: launches, requires mpd
- [x] kasts: launches
- [x] juk: launches, media tags work
- [x] kf6-kfilemetadata: media tags show under properties of a media file
- [x] kodi: launches, media tags work
- [x] gst-plugins-good1: works
- [x] soundkonverter: works
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 100188 bytes --]
From 5d662dcec21477e7945ed7c6ab5a426f5dc4af97 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a51d54d5472096..24557ce39be7d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From fe20747ed5080c3b20acc75117f84ecdae50b826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From f52739cf432e3e48b3f78d930ab9f4c17f76ffec Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 0b3534c785a6afc59fcc16039154d094606d1035 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 51d37965aac3ff8848326fa9f8a566181ef4680d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 93026bbfe3019c5a820f00ec58ebb9c5c0a01433 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From d5ec9cc91e11f4bd6296858fd1ff4c0ebe6117a6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 1c712d54abad5c1690c1f96b9388b0e28fae57f7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From 0efe33bed727ff0d581065db457c722c83138d70 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From 91c08e5a6c80a4c92cec481675b3804bb1bd457d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 8060f78c3937543f8912a0c99ff68b563eaf78cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 324 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 326 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..c1946ab55d4f44
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,324 @@
+From: =?utf-8?b?QmFsbMOzIEd5w7ZyZ3k=?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+Forwarded: https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/16
+Bug-Debian: https://bugs.debian.org/1092704
+---
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8716331..8772d52 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54d..4f99b24 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c..1728189 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 11 Jan 2025 14:48:46 -0500
+Subject: taglib-2 further fix
+
+Further fix compatibility with taglib 2.x on 32-bit architecture.
+---
+ src/tags/gio_wrapper.cc | 20 ++++++++++----------
+ src/tags/gio_wrapper.h | 20 ++++++++++----------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8772d52..8fdd9e7 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,7 +47,7 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (ulong len)
++GIO_InputStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -95,7 +95,7 @@ GIO_InputStream::isOpen () const
+ }
+
+ void
+-GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_InputStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -133,13 +133,13 @@ GIO_InputStream::clear ()
+ }
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::length ()
+ {
+ if (error)
+@@ -161,7 +161,7 @@ GIO_InputStream::length ()
+ }
+
+ void
+-GIO_InputStream::truncate (long int len)
++GIO_InputStream::truncate (TagLib::offset_t len)
+ {
+ g_warning ("%s", "Trying to truncate read-only file");
+ }
+@@ -200,7 +200,7 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (ulong len)
++GIO_IOStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -400,7 +400,7 @@ GIO_IOStream::isOpen () const
+ }
+
+ void
+-GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_IOStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -434,13 +434,13 @@ GIO_IOStream::clear ()
+ g_clear_error (&error);
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::length ()
+ {
+ long rv = -1;
+@@ -464,7 +464,7 @@ GIO_IOStream::length ()
+ }
+
+ void
+-GIO_IOStream::truncate (long int len)
++GIO_IOStream::truncate (TagLib::offset_t len)
+ {
+ if (error)
+ {
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index 4f99b24..fc634ab 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,17 +33,17 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+@@ -61,17 +61,17 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From dce2a46a7dee566f93506b350d69772a290ad6af Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: revbump for libtag
---
srcpkgs/flacon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..ae589f682d9ee4 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,7 +1,7 @@
# Template file for 'flacon'
pkgname=flacon
version=9.0.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="qt5-tools-devel uchardet-devel taglib-devel"
From 10f9e83de72f6504ff36a82012b7c504dd727d95 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..7bfbfb3ef4e905 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,24 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+configure_args="-DWITH_SYSTEMD=OFF -DWITH_AVCODEC=ON -DWITH_NPUPNP=ON"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
- libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ libexif-devel libnpupnp-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
-
-# libupnp uses large file support, so users must do that, too
-CXXFLAGS="-D_FILE_OFFSET_BITS=64"
-
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
system_accounts="gerbera"
make_dirs="/var/lib/gerbera 0750 gerbera gerbera"
From 8f71c0de0b7a868bab2d8d9027d4b579d577c80e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 7415bb90ff248a56d90c07d251276010a6c196e5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 15/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 8fd9ed0a13537592b4f3cbcbaa9df9ee9be64550 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 16/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From a66e4f8a842b9788ae7fb582dc1d67ae7f0775f8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 17/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From e5c9b39128ff7590fa0d9d531261d21ce54ba1f3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 18/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 9dc1edd689d5dea06badd0c16982bc984bb7bcfc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 19/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 9e9e18ee2231866a4ce3b9114342a8584c8dda8e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 20/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From 2921f5a9eccd8ffcc748ae8e70669cc45c2c85a6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 21/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 1de4ad7c42b93bd19dd5eab57bb2d78d0d7a4216 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 22/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 5d5d19d1d92a6bd57a10799a5236c31112cddfa5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 23/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 49f865d006eb218fc3138f4d0e93d1472bdadbbd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 24/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From a1d040dd5bbbfb72e2bb4e6ba84f2cec13caf89d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 25/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 6af4bd2c01f87699a3d73a49f871da5d3a007791 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 26/41] strawberry: update to 1.2.8
---
srcpkgs/strawberry/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..fa83e19c57f6e1 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.8
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,9 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel
+ rapidjson sparsehash"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +18,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=f7148a716d0ed63e72c166e71b8e3b53890b33bd414e929ca29ad99ca0d9fa57
From f10f9df264d19252d8135083625fee6f4d41ab05 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 27/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From 2bf437f2df15763ff8f161627279c7977ddd1892 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 28/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 70f1fdc32656ed40047666e17130c334f86d296b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 29/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 24557ce39be7d9..ecc8efcac66412 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1233,8 +1233,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 470582d364c76f..a4ea7cf18724e9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -456,6 +456,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From cce2543ccbac68969061598abe9f3726de36b3d9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 30/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4ea7cf18724e9..da70c585142173 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -491,6 +491,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 25a0bb1b7fd719ae6893f59e957c074cfa9e203e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 31/41] ncmpcpp: update to 0.10.1, use taglib2
---
srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ----------------
srcpkgs/ncmpcpp/template | 20 ++++++++++----------
2 files changed, 10 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/ncmpcpp/patches/socket-inode.patch
diff --git a/srcpkgs/ncmpcpp/patches/socket-inode.patch b/srcpkgs/ncmpcpp/patches/socket-inode.patch
deleted file mode 100644
index 6bf92146ea0914..00000000000000
--- a/srcpkgs/ncmpcpp/patches/socket-inode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Support sockets without a socket inode
-# https://github.com/ncmpcpp/ncmpcpp/commit/40e4f98ee896ea10967eb1c4323bb718331eabea
-diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
-index ccdee31d..9a92e5df 100644
---- a/src/mpdpp.cpp
-+++ b/src/mpdpp.cpp
-@@ -147,7 +147,7 @@ unsigned Connection::Version() const
- void Connection::SetHostname(const std::string &host)
- {
- size_t at = host.find("@");
-- if (at != std::string::npos)
-+ if (at != 0 && at != std::string::npos)
- {
- m_password = host.substr(0, at);
- m_host = host.substr(at+1);
-
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..b0fba7f09df2a8 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,25 +1,25 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
-version=0.9.2
-revision=11
+version=0.10.1
+revision=1
build_style=gnu-configure
-configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
-hostmakedepends="pkg-config"
-makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+configure_args=" --enable-clock --enable-outputs --enable-unicode
+ --enable-visualizer --with-curl --with-taglib --with-fftw"
+hostmakedepends="automake libtool pkg-config"
+makedepends="boost-devel fftw-devel icu-devel libcurl-devel libltdl-devel
+ libmpdclient-devel readline-devel taglib-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://rybczak.net/ncmpcpp"
-distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
+distfiles="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${version}.tar.gz"
+checksum=ddc89da86595d272282ae8726cc7913867b9517eec6e765e66e6da860b58e2f9
# Required by waddwstr() with ncurses on musl
CXXFLAGS="-D_XOPEN_SOURCE=600"
pre_configure() {
- vsed -e '/^docdir/d' -i {,doc/}Makefile.in
+ autoreconf -fiv
}
post_install() {
From f476799a2bad08b10e10d95613d4d6fdd7ea9406 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 32/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 12ae11428c811ab28702983adf81ddd3cea613c0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 33/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From d178f8475795f090a54e4cda46cf2e07c2b260d8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 34/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 1da4c189029b4770aaf4b87b1d3b64d2eda67dd7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 35/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 76f7b2ecf21e0c75a441b2502d5368fb3935353c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 36/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From a7c200968b0f85bae9d2e2018596a6cd71464fd6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 37/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From 608f476c3b2674615bdfaad2635b237b6e01d6cd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 19 Mar 2025 14:47:49 +0100
Subject: [PATCH 38/41] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=3
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
From f6492061a80f95901bae2abfd37b8f2fb9e7cb46 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Mar 2025 14:15:46 +0100
Subject: [PATCH 39/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 34024aff716797..dadf10f47925fa 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.11
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 555e462bdf4d1a5dae42955f72a46b2ba2292d82 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 6 Apr 2025 16:50:13 +0200
Subject: [PATCH 40/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index da70c585142173..9de13a00ad5288 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -316,6 +316,7 @@ replaces="
icecat<=78.6.1_1
icu4lua-devel<=0.2B_14
icu4lua<=0.2B_14
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 36b32b5eddc33d516967a314ce913f45292f38c7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 7 Apr 2025 15:48:03 +0200
Subject: [PATCH 41/41] soundkonverter: patch for taglib2
---
srcpkgs/soundkonverter/patches/taglib2.diff | 259 ++++++++++++++++++++
srcpkgs/soundkonverter/template | 2 +-
2 files changed, 260 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/soundkonverter/patches/taglib2.diff
diff --git a/srcpkgs/soundkonverter/patches/taglib2.diff b/srcpkgs/soundkonverter/patches/taglib2.diff
new file mode 100644
index 00000000000000..6e24af2ec99250
--- /dev/null
+++ b/srcpkgs/soundkonverter/patches/taglib2.diff
@@ -0,0 +1,259 @@
+diff --git a/src/metadata/tagengine.cpp b/src/metadata/tagengine.cpp
+index 4056d676..0aa48b26 100644
+--- a/src/metadata/tagengine.cpp
++++ b/src/metadata/tagengine.cpp
+@@ -367,8 +367,8 @@ TagData* TagEngine::readTags( const KUrl& fileName )
+
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "aART" )
+ {
+@@ -680,7 +680,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -688,7 +688,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -698,7 +698,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -711,7 +711,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -721,7 +721,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -734,7 +734,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -742,7 +742,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -755,7 +755,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -763,7 +763,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -773,7 +773,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -786,7 +786,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -796,7 +796,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -809,7 +809,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -817,7 +817,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -830,7 +830,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -838,7 +838,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -848,7 +848,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -861,7 +861,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -871,7 +871,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -884,7 +884,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -892,7 +892,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -903,27 +903,27 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+ if( !tagData->albumArtist.isEmpty() )
+- tag->itemListMap()["aART"] = TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("aART", TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->composer.isEmpty() )
+- tag->itemListMap()["\xA9wrt"] = TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("\xA9wrt", TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( tagData->trackTotal > 0 )
+- tag->itemListMap()["trkn"] = TagLib::MP4::Item( tagData->track, tagData->trackTotal );
++ tag->setItem("trkn", TagLib::MP4::Item( tagData->track, tagData->trackTotal ));
+
+ if( tagData->disc > 0 )
+ {
+ if( tagData->discTotal > 0 )
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc, tagData->discTotal );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc, tagData->discTotal ));
+ else
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc ));
+ }
+
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Track Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Track Id", TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Album Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Album Id", TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8)));
+ }
+ }
+ else if( TagLib::ASF::File *file = dynamic_cast<TagLib::ASF::File*>(fileref.file()) )
+@@ -1136,8 +1136,8 @@ QList<CoverData*> TagEngine::readCovers( const KUrl& fileName )
+ {
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "covr" )
+ {
+@@ -1290,7 +1290,7 @@ bool TagEngine::writeCovers( const KUrl& fileName, QList<CoverData*> covers )
+
+ coversList.append( TagLib::MP4::CoverArt( format, TagLib::ByteVector( cover->data.data(), cover->data.size() ) ) );
+ }
+- tag->itemListMap()["covr"] = TagLib::MP4::Item( coversList );
++ tag->setItem("covr", TagLib::MP4::Item( coversList ));
+ }
+
+ return fileref.save();
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
index e11cd96426472b..f31ba5a0c158a0 100644
--- a/srcpkgs/soundkonverter/template
+++ b/srcpkgs/soundkonverter/template
@@ -1,7 +1,7 @@
# Template file for 'soundkonverter'
pkgname=soundkonverter
version=3.0.1
-revision=2
+revision=3
build_wrksrc=src
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (56 preceding siblings ...)
2025-04-07 14:16 ` slymattz
@ 2025-04-16 20:17 ` slymattz
2025-04-16 20:24 ` slymattz
` (37 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-04-16 20:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5825 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Motivation for upgrading taglib
[https://taglib.org/older.html](https://taglib.org/older.html):
> New major version, binary incompatible, but mostly source-compatible with the latest 1.x release if no deprecated features are used. Simple applications should build without changes, more complex applications (e.g. extending classes of TagLib) will have to be adapted.
I believe more complex applications will soon/already do require taglib2. Other distros typically have both packages: taglib1 and taglib. For now, a little patching is needed but I bet future releases of "more complex applications" will use taglib2 by default as it's been around for ca. 1.5 years. Taglib1 no longer receives updates and it would be needed for just a handful of apps (see removed apps below), so I'm not sure if taglib1 would make sense in Void, especially because of alternative packages available in the repo which serve the purpose.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
EDIT 3/19/25: resolved a base conflict (updated kodi to 21.2 as 21.1 wouldn't build for i686).
EDIT 3/26/25: resolve a gst-plugins-good1 conflict
EDIT 4/6/25: resolved a base conflict with removed-packages and added the `-DWITH_NPUPNP=ON` flag to gerbera
EDIT: 4/7/25: applied a patch to soundkonverter for compatibility with taglib2
[ci skip for now]
#### About removed packages:
1. loudgain: soundkonverter is said to do ReplayGain calculations. Alternatively, loudgain could be replaced with rsgain (not packaged in Void at this time.) This works:
```
# Template file for 'rsgain'
pkgname=rsgain
version=3.6
revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="ffmpeg-devel fmt-devel taglib-devel libebur128-devel inih-devel"
short_desc="Simple, but powerful ReplayGain 2.0 tagging utility"
maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/complexlogic/rsgain"
distfiles="https://github.com/complexlogic/rsgain/archive/refs/tags/v${version}.tar.gz"
checksum=26f7acd1ba0851929dc756c93b3b1a6d66d7f2f36b31f744c8181f14d7b5c8a7
post_install() {
vlicense LICENSE
vlicense LICENSE-CRCpp
}
```
2. id3ted: there are plenty of alternatives, be it GUI-based or CLI. In the repo there's kid3, picard or puddletag, for instance.
3. libtaginfo: there are alternatives like python3-mutagen or ffmpeg etc.
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
#### Testing individual packages:
- [x] ario
- [x] moc: mocp launches, media tags work
- [x] parole: launches, media tags work
- [x] pragha: launches, media tags work
- [x] thunar-media-tags-plugin: editing tags in thunar works
- [x] QMPlay2: launches, media tags work
- [x] ardour: launches, allows for the editing of metadata
- [x] clementine: launches, media tags work
- [x] easytag: launches, media tags work
- [x] flacon: launches, media tags work
- [x] gerbera: update to 2.5.0 - works well, I use it on a daily basis
- [x] gogglesmm: launches, media tags work
- [x] k3b: launches and works fine
- [x] vlc: launches, media tags work
- [x] kfilemetadata5: I guess it works. I'm not sure how to test it.
- [x] kid3: launches, media tags work
- [x] krename: launches, media tags work
- [x] lms: works
- [x] mixxx: update to 2.5.0: launches, media tags work
- [x] mp3unicode: launches
- [x] musikcube: launches, media tags work
- [x] qmmp: update to 1.7.3: launches, media tags work
- [x] quimup: update to 2.1.1: launches fine
- [x] strawberry: update to 1.2.7 - works well, I use it on a daily basis
- [x] tellico: launches
- [x] vimpc: launches, requires mpd
- [x] ncmpcpp: launches, requires mpd
- [x] kasts: launches
- [x] juk: launches, media tags work
- [x] kf6-kfilemetadata: media tags show under properties of a media file
- [x] kodi: launches, media tags work
- [x] gst-plugins-good1: works
- [x] soundkonverter: works
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 101235 bytes --]
From 5d662dcec21477e7945ed7c6ab5a426f5dc4af97 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a51d54d5472096..24557ce39be7d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From fe20747ed5080c3b20acc75117f84ecdae50b826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From f52739cf432e3e48b3f78d930ab9f4c17f76ffec Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 0b3534c785a6afc59fcc16039154d094606d1035 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 51d37965aac3ff8848326fa9f8a566181ef4680d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 93026bbfe3019c5a820f00ec58ebb9c5c0a01433 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From d5ec9cc91e11f4bd6296858fd1ff4c0ebe6117a6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 1c712d54abad5c1690c1f96b9388b0e28fae57f7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From 0efe33bed727ff0d581065db457c722c83138d70 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From 91c08e5a6c80a4c92cec481675b3804bb1bd457d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 8060f78c3937543f8912a0c99ff68b563eaf78cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 324 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 326 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..c1946ab55d4f44
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,324 @@
+From: =?utf-8?b?QmFsbMOzIEd5w7ZyZ3k=?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+Forwarded: https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/16
+Bug-Debian: https://bugs.debian.org/1092704
+---
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8716331..8772d52 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54d..4f99b24 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c..1728189 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 11 Jan 2025 14:48:46 -0500
+Subject: taglib-2 further fix
+
+Further fix compatibility with taglib 2.x on 32-bit architecture.
+---
+ src/tags/gio_wrapper.cc | 20 ++++++++++----------
+ src/tags/gio_wrapper.h | 20 ++++++++++----------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8772d52..8fdd9e7 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,7 +47,7 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (ulong len)
++GIO_InputStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -95,7 +95,7 @@ GIO_InputStream::isOpen () const
+ }
+
+ void
+-GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_InputStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -133,13 +133,13 @@ GIO_InputStream::clear ()
+ }
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::length ()
+ {
+ if (error)
+@@ -161,7 +161,7 @@ GIO_InputStream::length ()
+ }
+
+ void
+-GIO_InputStream::truncate (long int len)
++GIO_InputStream::truncate (TagLib::offset_t len)
+ {
+ g_warning ("%s", "Trying to truncate read-only file");
+ }
+@@ -200,7 +200,7 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (ulong len)
++GIO_IOStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -400,7 +400,7 @@ GIO_IOStream::isOpen () const
+ }
+
+ void
+-GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_IOStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -434,13 +434,13 @@ GIO_IOStream::clear ()
+ g_clear_error (&error);
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::length ()
+ {
+ long rv = -1;
+@@ -464,7 +464,7 @@ GIO_IOStream::length ()
+ }
+
+ void
+-GIO_IOStream::truncate (long int len)
++GIO_IOStream::truncate (TagLib::offset_t len)
+ {
+ if (error)
+ {
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index 4f99b24..fc634ab 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,17 +33,17 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+@@ -61,17 +61,17 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From d9e2168e49fba5f3396fa3a9d6872c4bf0a3a733 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: update to 12.0.0, switch to qt6
---
srcpkgs/flacon/template | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..521a39aa9043b6 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,10 +1,11 @@
# Template file for 'flacon'
pkgname=flacon
-version=9.0.0
+version=12.0.0
revision=1
build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="qt5-tools-devel uchardet-devel taglib-devel"
+configure_args="-DUSE_QT6=ON -DUSE_QT5=OFF"
+hostmakedepends="pkg-config qt6-tools"
+makedepends="qt6-tools-devel qt6-widgets uchardet-devel taglib-devel"
depends="ffmpeg hicolor-icon-theme"
short_desc="Audio File Encoder. Splits audio tracks into separate tracks"
maintainer="travankor <travankor@tuta.io>"
@@ -12,10 +13,14 @@ license="LGPL-2.1-or-later"
homepage="https://flacon.github.io/"
changelog="https://flacon.github.io/changelog/"
distfiles="https://github.com/Flacon/flacon/archive/v${version}.tar.gz"
-checksum=a83d5fe297ceb6408b7f63c56a6be336fe1c6d06ebedcc0c84a3f7dd234140e4
+checksum=78199ff925b7cd0ffeb628d47909ca4172f8ff0d8fd8192bb537e0c012e6f4c6
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-qmake"
+ hostmakedepends+=" qt6-base"
+ post_configure() {
+ # use host lrelease instead of target binary which breaks compilation
+ vsed -i build/build.ninja -e "s|${XBPS_CROSS_BASE}/usr/lib.*/qt6/bin/lrelease|/usr/lib/qt6/bin/lrelease|g"
+ }
fi
post_install() {
From 03155daae1dfb2dacfae0ae4d289bed816bc8bfd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..7bfbfb3ef4e905 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,24 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+configure_args="-DWITH_SYSTEMD=OFF -DWITH_AVCODEC=ON -DWITH_NPUPNP=ON"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
- libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ libexif-devel libnpupnp-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
-
-# libupnp uses large file support, so users must do that, too
-CXXFLAGS="-D_FILE_OFFSET_BITS=64"
-
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
system_accounts="gerbera"
make_dirs="/var/lib/gerbera 0750 gerbera gerbera"
From e8bbf0c1550923f55a40545a8b7ff39c846b01e5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From dcf3386eee5b96dc93f95317adad019cd1ca47a4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 15/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From cf6aec78a51dba499c8a5646ed4b7efcd9428f06 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 16/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From fa1d9961fb2f80fbc743ede7e3817377ae35a39c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 17/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From d95c9e23ee290bdf44e7e8259baceef78499e25c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 18/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 414d0d099ba69b27affc7c8fab828940c7f715a5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 19/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 2e370a4e29e10af370dbaa42f4ca8710fa5e9762 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 20/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From ad18239d07bf838711df516e4e103491e60d52e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 21/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 7b7414eab6986d7cb508cb0cc3ee023aa1f26c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 22/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From e6c0fe59c0c7ad110aac370b9acec173c7de6f30 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 23/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 90e2a4ce51e8a341e5cdf0f9898918ddfb5e5b93 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 24/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From 133c88f9672210be54a6d49ab59c9642da03ad9a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 25/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From b140ad97cc5708ed80ead35bf0b5830fc1a68e08 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 26/41] strawberry: update to 1.2.8
---
srcpkgs/strawberry/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..fa83e19c57f6e1 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.8
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,9 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel
+ rapidjson sparsehash"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +18,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=f7148a716d0ed63e72c166e71b8e3b53890b33bd414e929ca29ad99ca0d9fa57
From 00bcbf02fce9002773bf820b684da6a98eb69e22 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 27/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From dadb7314a722ef8a76556ab8d293b3d3ef81e77e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 28/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From a29db1c4c78938dc50db1da1614a10bbee868c56 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 29/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 24557ce39be7d9..ecc8efcac66412 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1233,8 +1233,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 470582d364c76f..a4ea7cf18724e9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -456,6 +456,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From b5236c5d616d3b75f8ac7bb70fd49472954af2dc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 30/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4ea7cf18724e9..da70c585142173 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -491,6 +491,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 6ee0b10ff50f31e27681b04cb2dc9655c41e8fec Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 31/41] ncmpcpp: update to 0.10.1, use taglib2
---
srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ----------------
srcpkgs/ncmpcpp/template | 20 ++++++++++----------
2 files changed, 10 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/ncmpcpp/patches/socket-inode.patch
diff --git a/srcpkgs/ncmpcpp/patches/socket-inode.patch b/srcpkgs/ncmpcpp/patches/socket-inode.patch
deleted file mode 100644
index 6bf92146ea0914..00000000000000
--- a/srcpkgs/ncmpcpp/patches/socket-inode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Support sockets without a socket inode
-# https://github.com/ncmpcpp/ncmpcpp/commit/40e4f98ee896ea10967eb1c4323bb718331eabea
-diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
-index ccdee31d..9a92e5df 100644
---- a/src/mpdpp.cpp
-+++ b/src/mpdpp.cpp
-@@ -147,7 +147,7 @@ unsigned Connection::Version() const
- void Connection::SetHostname(const std::string &host)
- {
- size_t at = host.find("@");
-- if (at != std::string::npos)
-+ if (at != 0 && at != std::string::npos)
- {
- m_password = host.substr(0, at);
- m_host = host.substr(at+1);
-
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..b0fba7f09df2a8 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,25 +1,25 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
-version=0.9.2
-revision=11
+version=0.10.1
+revision=1
build_style=gnu-configure
-configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
-hostmakedepends="pkg-config"
-makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+configure_args=" --enable-clock --enable-outputs --enable-unicode
+ --enable-visualizer --with-curl --with-taglib --with-fftw"
+hostmakedepends="automake libtool pkg-config"
+makedepends="boost-devel fftw-devel icu-devel libcurl-devel libltdl-devel
+ libmpdclient-devel readline-devel taglib-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://rybczak.net/ncmpcpp"
-distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
+distfiles="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${version}.tar.gz"
+checksum=ddc89da86595d272282ae8726cc7913867b9517eec6e765e66e6da860b58e2f9
# Required by waddwstr() with ncurses on musl
CXXFLAGS="-D_XOPEN_SOURCE=600"
pre_configure() {
- vsed -e '/^docdir/d' -i {,doc/}Makefile.in
+ autoreconf -fiv
}
post_install() {
From bfc4a0a6b710f83aa8e4e2da7cdd53952f6b6d1d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 32/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From b1b7bb0bc4335544be61cf4acab5a096206bd3de Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 33/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From 00b08d03e08d768cd87bc0c9f8411bd9b4e39c2f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 34/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 876dcc22e1a00bd5718b7b02c46a82fd42306024 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 35/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 36956a8bc61cd814c6ee5a308404dda9582014bb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 36/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 3bd1e857c02402cde6237f75bf7d0650907ba5fc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 37/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From d3792b39469b23d0068d27c8ec6604a827dc5a9a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 19 Mar 2025 14:47:49 +0100
Subject: [PATCH 38/41] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=3
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
From 862a4ca70e9704622deee5be1c94a7cb242e24bd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Mar 2025 14:15:46 +0100
Subject: [PATCH 39/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 34024aff716797..dadf10f47925fa 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.11
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From c2a387c3de85d109bcd5f81e15c16f29d92de913 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 6 Apr 2025 16:50:13 +0200
Subject: [PATCH 40/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index da70c585142173..9de13a00ad5288 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -316,6 +316,7 @@ replaces="
icecat<=78.6.1_1
icu4lua-devel<=0.2B_14
icu4lua<=0.2B_14
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From f9dbb852738fbb59003b5302f5496bf9e2b13e0c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 7 Apr 2025 15:48:03 +0200
Subject: [PATCH 41/41] soundkonverter: patch for taglib2
---
srcpkgs/soundkonverter/patches/taglib2.diff | 259 ++++++++++++++++++++
srcpkgs/soundkonverter/template | 2 +-
2 files changed, 260 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/soundkonverter/patches/taglib2.diff
diff --git a/srcpkgs/soundkonverter/patches/taglib2.diff b/srcpkgs/soundkonverter/patches/taglib2.diff
new file mode 100644
index 00000000000000..6e24af2ec99250
--- /dev/null
+++ b/srcpkgs/soundkonverter/patches/taglib2.diff
@@ -0,0 +1,259 @@
+diff --git a/src/metadata/tagengine.cpp b/src/metadata/tagengine.cpp
+index 4056d676..0aa48b26 100644
+--- a/src/metadata/tagengine.cpp
++++ b/src/metadata/tagengine.cpp
+@@ -367,8 +367,8 @@ TagData* TagEngine::readTags( const KUrl& fileName )
+
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "aART" )
+ {
+@@ -680,7 +680,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -688,7 +688,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -698,7 +698,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -711,7 +711,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -721,7 +721,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -734,7 +734,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -742,7 +742,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -755,7 +755,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -763,7 +763,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -773,7 +773,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -786,7 +786,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -796,7 +796,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -809,7 +809,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -817,7 +817,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -830,7 +830,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -838,7 +838,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -848,7 +848,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -861,7 +861,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -871,7 +871,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -884,7 +884,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -892,7 +892,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -903,27 +903,27 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+ if( !tagData->albumArtist.isEmpty() )
+- tag->itemListMap()["aART"] = TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("aART", TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->composer.isEmpty() )
+- tag->itemListMap()["\xA9wrt"] = TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("\xA9wrt", TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( tagData->trackTotal > 0 )
+- tag->itemListMap()["trkn"] = TagLib::MP4::Item( tagData->track, tagData->trackTotal );
++ tag->setItem("trkn", TagLib::MP4::Item( tagData->track, tagData->trackTotal ));
+
+ if( tagData->disc > 0 )
+ {
+ if( tagData->discTotal > 0 )
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc, tagData->discTotal );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc, tagData->discTotal ));
+ else
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc ));
+ }
+
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Track Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Track Id", TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Album Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Album Id", TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8)));
+ }
+ }
+ else if( TagLib::ASF::File *file = dynamic_cast<TagLib::ASF::File*>(fileref.file()) )
+@@ -1136,8 +1136,8 @@ QList<CoverData*> TagEngine::readCovers( const KUrl& fileName )
+ {
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "covr" )
+ {
+@@ -1290,7 +1290,7 @@ bool TagEngine::writeCovers( const KUrl& fileName, QList<CoverData*> covers )
+
+ coversList.append( TagLib::MP4::CoverArt( format, TagLib::ByteVector( cover->data.data(), cover->data.size() ) ) );
+ }
+- tag->itemListMap()["covr"] = TagLib::MP4::Item( coversList );
++ tag->setItem("covr", TagLib::MP4::Item( coversList ));
+ }
+
+ return fileref.save();
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
index e11cd96426472b..f31ba5a0c158a0 100644
--- a/srcpkgs/soundkonverter/template
+++ b/srcpkgs/soundkonverter/template
@@ -1,7 +1,7 @@
# Template file for 'soundkonverter'
pkgname=soundkonverter
version=3.0.1
-revision=2
+revision=3
build_wrksrc=src
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (57 preceding siblings ...)
2025-04-16 20:17 ` slymattz
@ 2025-04-16 20:24 ` slymattz
2025-04-16 20:28 ` slymattz
` (36 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-04-16 20:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5886 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Motivation for upgrading taglib
[https://taglib.org/older.html](https://taglib.org/older.html):
> New major version, binary incompatible, but mostly source-compatible with the latest 1.x release if no deprecated features are used. Simple applications should build without changes, more complex applications (e.g. extending classes of TagLib) will have to be adapted.
I believe more complex applications will soon/already do require taglib2. Other distros typically have both packages: taglib1 and taglib. For now, a little patching is needed but I bet future releases of "more complex applications" will use taglib2 by default as it's been around for ca. 1.5 years. Taglib1 no longer receives updates and it would be needed for just a handful of apps (see removed apps below), so I'm not sure if taglib1 would make sense in Void, especially because of alternative packages available in the repo which serve the purpose.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
EDIT 3/19/25: resolved a base conflict (updated kodi to 21.2 as 21.1 wouldn't build for i686).
EDIT 3/26/25: resolve a gst-plugins-good1 conflict
EDIT 4/6/25: resolved a base conflict with removed-packages and added the `-DWITH_NPUPNP=ON` flag to gerbera
EDIT: 4/7/25: applied a patch to soundkonverter for compatibility with taglib2
EDIT: 4/16/25: flacon updated to 12.0.0 and switched to qt6
[ci skip for now]
#### About removed packages:
1. loudgain: soundkonverter is said to do ReplayGain calculations. Alternatively, loudgain could be replaced with rsgain (not packaged in Void at this time.) This works:
```
# Template file for 'rsgain'
pkgname=rsgain
version=3.6
revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="ffmpeg-devel fmt-devel taglib-devel libebur128-devel inih-devel"
short_desc="Simple, but powerful ReplayGain 2.0 tagging utility"
maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/complexlogic/rsgain"
distfiles="https://github.com/complexlogic/rsgain/archive/refs/tags/v${version}.tar.gz"
checksum=26f7acd1ba0851929dc756c93b3b1a6d66d7f2f36b31f744c8181f14d7b5c8a7
post_install() {
vlicense LICENSE
vlicense LICENSE-CRCpp
}
```
2. id3ted: there are plenty of alternatives, be it GUI-based or CLI. In the repo there's kid3, picard or puddletag, for instance.
3. libtaginfo: there are alternatives like python3-mutagen or ffmpeg etc.
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
#### Testing individual packages:
- [x] ario
- [x] moc: mocp launches, media tags work
- [x] parole: launches, media tags work
- [x] pragha: launches, media tags work
- [x] thunar-media-tags-plugin: editing tags in thunar works
- [x] QMPlay2: launches, media tags work
- [x] ardour: launches, allows for the editing of metadata
- [x] clementine: launches, media tags work
- [x] easytag: launches, media tags work
- [x] flacon: launches, media tags work
- [x] gerbera: update to 2.5.0 - works well, I use it on a daily basis
- [x] gogglesmm: launches, media tags work
- [x] k3b: launches and works fine
- [x] vlc: launches, media tags work
- [x] kfilemetadata5: I guess it works. I'm not sure how to test it.
- [x] kid3: launches, media tags work
- [x] krename: launches, media tags work
- [x] lms: works
- [x] mixxx: update to 2.5.0: launches, media tags work
- [x] mp3unicode: launches
- [x] musikcube: launches, media tags work
- [x] qmmp: update to 1.7.3: launches, media tags work
- [x] quimup: update to 2.1.1: launches fine
- [x] strawberry: update to 1.2.7 - works well, I use it on a daily basis
- [x] tellico: launches
- [x] vimpc: launches, requires mpd
- [x] ncmpcpp: launches, requires mpd
- [x] kasts: launches
- [x] juk: launches, media tags work
- [x] kf6-kfilemetadata: media tags show under properties of a media file
- [x] kodi: launches, media tags work
- [x] gst-plugins-good1: works
- [x] soundkonverter: works
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 101235 bytes --]
From 5d662dcec21477e7945ed7c6ab5a426f5dc4af97 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a51d54d5472096..24557ce39be7d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From fe20747ed5080c3b20acc75117f84ecdae50b826 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From f52739cf432e3e48b3f78d930ab9f4c17f76ffec Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 0b3534c785a6afc59fcc16039154d094606d1035 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 51d37965aac3ff8848326fa9f8a566181ef4680d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 93026bbfe3019c5a820f00ec58ebb9c5c0a01433 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From d5ec9cc91e11f4bd6296858fd1ff4c0ebe6117a6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 1c712d54abad5c1690c1f96b9388b0e28fae57f7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From 0efe33bed727ff0d581065db457c722c83138d70 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From 91c08e5a6c80a4c92cec481675b3804bb1bd457d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 8060f78c3937543f8912a0c99ff68b563eaf78cb Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 324 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 326 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..c1946ab55d4f44
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,324 @@
+From: =?utf-8?b?QmFsbMOzIEd5w7ZyZ3k=?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+Forwarded: https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/16
+Bug-Debian: https://bugs.debian.org/1092704
+---
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8716331..8772d52 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54d..4f99b24 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c..1728189 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 11 Jan 2025 14:48:46 -0500
+Subject: taglib-2 further fix
+
+Further fix compatibility with taglib 2.x on 32-bit architecture.
+---
+ src/tags/gio_wrapper.cc | 20 ++++++++++----------
+ src/tags/gio_wrapper.h | 20 ++++++++++----------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8772d52..8fdd9e7 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,7 +47,7 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (ulong len)
++GIO_InputStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -95,7 +95,7 @@ GIO_InputStream::isOpen () const
+ }
+
+ void
+-GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_InputStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -133,13 +133,13 @@ GIO_InputStream::clear ()
+ }
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::length ()
+ {
+ if (error)
+@@ -161,7 +161,7 @@ GIO_InputStream::length ()
+ }
+
+ void
+-GIO_InputStream::truncate (long int len)
++GIO_InputStream::truncate (TagLib::offset_t len)
+ {
+ g_warning ("%s", "Trying to truncate read-only file");
+ }
+@@ -200,7 +200,7 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (ulong len)
++GIO_IOStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -400,7 +400,7 @@ GIO_IOStream::isOpen () const
+ }
+
+ void
+-GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_IOStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -434,13 +434,13 @@ GIO_IOStream::clear ()
+ g_clear_error (&error);
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::length ()
+ {
+ long rv = -1;
+@@ -464,7 +464,7 @@ GIO_IOStream::length ()
+ }
+
+ void
+-GIO_IOStream::truncate (long int len)
++GIO_IOStream::truncate (TagLib::offset_t len)
+ {
+ if (error)
+ {
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index 4f99b24..fc634ab 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,17 +33,17 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+@@ -61,17 +61,17 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From d9e2168e49fba5f3396fa3a9d6872c4bf0a3a733 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: update to 12.0.0, switch to qt6
---
srcpkgs/flacon/template | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..521a39aa9043b6 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,10 +1,11 @@
# Template file for 'flacon'
pkgname=flacon
-version=9.0.0
+version=12.0.0
revision=1
build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="qt5-tools-devel uchardet-devel taglib-devel"
+configure_args="-DUSE_QT6=ON -DUSE_QT5=OFF"
+hostmakedepends="pkg-config qt6-tools"
+makedepends="qt6-tools-devel qt6-widgets uchardet-devel taglib-devel"
depends="ffmpeg hicolor-icon-theme"
short_desc="Audio File Encoder. Splits audio tracks into separate tracks"
maintainer="travankor <travankor@tuta.io>"
@@ -12,10 +13,14 @@ license="LGPL-2.1-or-later"
homepage="https://flacon.github.io/"
changelog="https://flacon.github.io/changelog/"
distfiles="https://github.com/Flacon/flacon/archive/v${version}.tar.gz"
-checksum=a83d5fe297ceb6408b7f63c56a6be336fe1c6d06ebedcc0c84a3f7dd234140e4
+checksum=78199ff925b7cd0ffeb628d47909ca4172f8ff0d8fd8192bb537e0c012e6f4c6
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-qmake"
+ hostmakedepends+=" qt6-base"
+ post_configure() {
+ # use host lrelease instead of target binary which breaks compilation
+ vsed -i build/build.ninja -e "s|${XBPS_CROSS_BASE}/usr/lib.*/qt6/bin/lrelease|/usr/lib/qt6/bin/lrelease|g"
+ }
fi
post_install() {
From 03155daae1dfb2dacfae0ae4d289bed816bc8bfd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..7bfbfb3ef4e905 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,24 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+configure_args="-DWITH_SYSTEMD=OFF -DWITH_AVCODEC=ON -DWITH_NPUPNP=ON"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
- libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ libexif-devel libnpupnp-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
-
-# libupnp uses large file support, so users must do that, too
-CXXFLAGS="-D_FILE_OFFSET_BITS=64"
-
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
system_accounts="gerbera"
make_dirs="/var/lib/gerbera 0750 gerbera gerbera"
From e8bbf0c1550923f55a40545a8b7ff39c846b01e5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From dcf3386eee5b96dc93f95317adad019cd1ca47a4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 15/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From cf6aec78a51dba499c8a5646ed4b7efcd9428f06 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 16/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From fa1d9961fb2f80fbc743ede7e3817377ae35a39c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 17/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From d95c9e23ee290bdf44e7e8259baceef78499e25c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 18/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 414d0d099ba69b27affc7c8fab828940c7f715a5 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 19/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 2e370a4e29e10af370dbaa42f4ca8710fa5e9762 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 20/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From ad18239d07bf838711df516e4e103491e60d52e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 21/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 7b7414eab6986d7cb508cb0cc3ee023aa1f26c17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 22/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From e6c0fe59c0c7ad110aac370b9acec173c7de6f30 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 23/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 90e2a4ce51e8a341e5cdf0f9898918ddfb5e5b93 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 24/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From 133c88f9672210be54a6d49ab59c9642da03ad9a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 25/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From df36856b391553c64755161752e33a34138fca08 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 26/41] strawberry: update to 1.2.9
---
srcpkgs/strawberry/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..9d9858f14aacbf 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.9
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,9 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel
+ rapidjson sparsehash"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +18,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=7099a35973d2551489ebbf6f33487169134e57fb292a4aeed07e68aa8d939e76
From 8b874f48f22ac2f175806162dccd5b86152af4ee Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 27/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From f265024ba8f7510b6ba11bf70d3717ee632a1e1c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 28/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From 5cb23caf60145677a09d7b33f00639cc25dd5234 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 29/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 24557ce39be7d9..ecc8efcac66412 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1233,8 +1233,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 470582d364c76f..a4ea7cf18724e9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -456,6 +456,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From a6473689419297493507c69197aaed7d29395628 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 30/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a4ea7cf18724e9..da70c585142173 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -491,6 +491,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 09a17fb882ada17cdcfeb2cf3139693ca9683ab1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 31/41] ncmpcpp: update to 0.10.1, use taglib2
---
srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ----------------
srcpkgs/ncmpcpp/template | 20 ++++++++++----------
2 files changed, 10 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/ncmpcpp/patches/socket-inode.patch
diff --git a/srcpkgs/ncmpcpp/patches/socket-inode.patch b/srcpkgs/ncmpcpp/patches/socket-inode.patch
deleted file mode 100644
index 6bf92146ea0914..00000000000000
--- a/srcpkgs/ncmpcpp/patches/socket-inode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Support sockets without a socket inode
-# https://github.com/ncmpcpp/ncmpcpp/commit/40e4f98ee896ea10967eb1c4323bb718331eabea
-diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
-index ccdee31d..9a92e5df 100644
---- a/src/mpdpp.cpp
-+++ b/src/mpdpp.cpp
-@@ -147,7 +147,7 @@ unsigned Connection::Version() const
- void Connection::SetHostname(const std::string &host)
- {
- size_t at = host.find("@");
-- if (at != std::string::npos)
-+ if (at != 0 && at != std::string::npos)
- {
- m_password = host.substr(0, at);
- m_host = host.substr(at+1);
-
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..b0fba7f09df2a8 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,25 +1,25 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
-version=0.9.2
-revision=11
+version=0.10.1
+revision=1
build_style=gnu-configure
-configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
-hostmakedepends="pkg-config"
-makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+configure_args=" --enable-clock --enable-outputs --enable-unicode
+ --enable-visualizer --with-curl --with-taglib --with-fftw"
+hostmakedepends="automake libtool pkg-config"
+makedepends="boost-devel fftw-devel icu-devel libcurl-devel libltdl-devel
+ libmpdclient-devel readline-devel taglib-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://rybczak.net/ncmpcpp"
-distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
+distfiles="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${version}.tar.gz"
+checksum=ddc89da86595d272282ae8726cc7913867b9517eec6e765e66e6da860b58e2f9
# Required by waddwstr() with ncurses on musl
CXXFLAGS="-D_XOPEN_SOURCE=600"
pre_configure() {
- vsed -e '/^docdir/d' -i {,doc/}Makefile.in
+ autoreconf -fiv
}
post_install() {
From cad581f1fcb0be51cacc9a398001660ee18d302b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 32/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From dba3fd065e51457ae5bb32b972b3a1bdae4a134e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 33/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From e962ecc95b2c189e9faee141de35a9cffdd8d8c9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 34/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 60bf7d327763b217a9666efeb8904c7ddbe3b1e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 35/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From bf95a28bea9edafdcfc07e854984e36c3a5c8be7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 36/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 04e145191acc4b104c5de9d22d4567d360e4b004 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 37/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From ae8cb616086110dcde7ff34234b4b8c7d9057244 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 19 Mar 2025 14:47:49 +0100
Subject: [PATCH 38/41] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=3
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
From db1c07b886845b78e04fff4a304419ff6fd9dd6c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Mar 2025 14:15:46 +0100
Subject: [PATCH 39/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 34024aff716797..dadf10f47925fa 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.11
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 893204c411bde8fe18c3c5972dd4566f756664d7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 6 Apr 2025 16:50:13 +0200
Subject: [PATCH 40/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index da70c585142173..9de13a00ad5288 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -316,6 +316,7 @@ replaces="
icecat<=78.6.1_1
icu4lua-devel<=0.2B_14
icu4lua<=0.2B_14
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From d4b1b570a0a79dbada9913cd2b3dc337d843aac3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 7 Apr 2025 15:48:03 +0200
Subject: [PATCH 41/41] soundkonverter: patch for taglib2
---
srcpkgs/soundkonverter/patches/taglib2.diff | 259 ++++++++++++++++++++
srcpkgs/soundkonverter/template | 2 +-
2 files changed, 260 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/soundkonverter/patches/taglib2.diff
diff --git a/srcpkgs/soundkonverter/patches/taglib2.diff b/srcpkgs/soundkonverter/patches/taglib2.diff
new file mode 100644
index 00000000000000..6e24af2ec99250
--- /dev/null
+++ b/srcpkgs/soundkonverter/patches/taglib2.diff
@@ -0,0 +1,259 @@
+diff --git a/src/metadata/tagengine.cpp b/src/metadata/tagengine.cpp
+index 4056d676..0aa48b26 100644
+--- a/src/metadata/tagengine.cpp
++++ b/src/metadata/tagengine.cpp
+@@ -367,8 +367,8 @@ TagData* TagEngine::readTags( const KUrl& fileName )
+
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "aART" )
+ {
+@@ -680,7 +680,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -688,7 +688,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -698,7 +698,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -711,7 +711,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -721,7 +721,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -734,7 +734,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -742,7 +742,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -755,7 +755,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -763,7 +763,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -773,7 +773,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -786,7 +786,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -796,7 +796,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -809,7 +809,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -817,7 +817,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -830,7 +830,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -838,7 +838,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -848,7 +848,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -861,7 +861,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -871,7 +871,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -884,7 +884,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -892,7 +892,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -903,27 +903,27 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+ if( !tagData->albumArtist.isEmpty() )
+- tag->itemListMap()["aART"] = TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("aART", TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->composer.isEmpty() )
+- tag->itemListMap()["\xA9wrt"] = TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("\xA9wrt", TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( tagData->trackTotal > 0 )
+- tag->itemListMap()["trkn"] = TagLib::MP4::Item( tagData->track, tagData->trackTotal );
++ tag->setItem("trkn", TagLib::MP4::Item( tagData->track, tagData->trackTotal ));
+
+ if( tagData->disc > 0 )
+ {
+ if( tagData->discTotal > 0 )
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc, tagData->discTotal );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc, tagData->discTotal ));
+ else
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc ));
+ }
+
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Track Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Track Id", TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Album Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Album Id", TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8)));
+ }
+ }
+ else if( TagLib::ASF::File *file = dynamic_cast<TagLib::ASF::File*>(fileref.file()) )
+@@ -1136,8 +1136,8 @@ QList<CoverData*> TagEngine::readCovers( const KUrl& fileName )
+ {
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "covr" )
+ {
+@@ -1290,7 +1290,7 @@ bool TagEngine::writeCovers( const KUrl& fileName, QList<CoverData*> covers )
+
+ coversList.append( TagLib::MP4::CoverArt( format, TagLib::ByteVector( cover->data.data(), cover->data.size() ) ) );
+ }
+- tag->itemListMap()["covr"] = TagLib::MP4::Item( coversList );
++ tag->setItem("covr", TagLib::MP4::Item( coversList ));
+ }
+
+ return fileref.save();
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
index e11cd96426472b..f31ba5a0c158a0 100644
--- a/srcpkgs/soundkonverter/template
+++ b/srcpkgs/soundkonverter/template
@@ -1,7 +1,7 @@
# Template file for 'soundkonverter'
pkgname=soundkonverter
version=3.0.1
-revision=2
+revision=3
build_wrksrc=src
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (58 preceding siblings ...)
2025-04-16 20:24 ` slymattz
@ 2025-04-16 20:28 ` slymattz
2025-04-16 20:32 ` slymattz
` (35 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-04-16 20:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5886 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Motivation for upgrading taglib
[https://taglib.org/older.html](https://taglib.org/older.html):
> New major version, binary incompatible, but mostly source-compatible with the latest 1.x release if no deprecated features are used. Simple applications should build without changes, more complex applications (e.g. extending classes of TagLib) will have to be adapted.
I believe more complex applications will soon/already do require taglib2. Other distros typically have both packages: taglib1 and taglib. For now, a little patching is needed but I bet future releases of "more complex applications" will use taglib2 by default as it's been around for ca. 1.5 years. Taglib1 no longer receives updates and it would be needed for just a handful of apps (see removed apps below), so I'm not sure if taglib1 would make sense in Void, especially because of alternative packages available in the repo which serve the purpose.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
EDIT 3/19/25: resolved a base conflict (updated kodi to 21.2 as 21.1 wouldn't build for i686).
EDIT 3/26/25: resolve a gst-plugins-good1 conflict
EDIT 4/6/25: resolved a base conflict with removed-packages and added the `-DWITH_NPUPNP=ON` flag to gerbera
EDIT: 4/7/25: applied a patch to soundkonverter for compatibility with taglib2
EDIT: 4/16/25: flacon updated to 12.0.0 and switched to qt6
[ci skip for now]
#### About removed packages:
1. loudgain: soundkonverter is said to do ReplayGain calculations. Alternatively, loudgain could be replaced with rsgain (not packaged in Void at this time.) This works:
```
# Template file for 'rsgain'
pkgname=rsgain
version=3.6
revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="ffmpeg-devel fmt-devel taglib-devel libebur128-devel inih-devel"
short_desc="Simple, but powerful ReplayGain 2.0 tagging utility"
maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/complexlogic/rsgain"
distfiles="https://github.com/complexlogic/rsgain/archive/refs/tags/v${version}.tar.gz"
checksum=26f7acd1ba0851929dc756c93b3b1a6d66d7f2f36b31f744c8181f14d7b5c8a7
post_install() {
vlicense LICENSE
vlicense LICENSE-CRCpp
}
```
2. id3ted: there are plenty of alternatives, be it GUI-based or CLI. In the repo there's kid3, picard or puddletag, for instance.
3. libtaginfo: there are alternatives like python3-mutagen or ffmpeg etc.
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
#### Testing individual packages:
- [x] ario
- [x] moc: mocp launches, media tags work
- [x] parole: launches, media tags work
- [x] pragha: launches, media tags work
- [x] thunar-media-tags-plugin: editing tags in thunar works
- [x] QMPlay2: launches, media tags work
- [x] ardour: launches, allows for the editing of metadata
- [x] clementine: launches, media tags work
- [x] easytag: launches, media tags work
- [x] flacon: launches, media tags work
- [x] gerbera: update to 2.5.0 - works well, I use it on a daily basis
- [x] gogglesmm: launches, media tags work
- [x] k3b: launches and works fine
- [x] vlc: launches, media tags work
- [x] kfilemetadata5: I guess it works. I'm not sure how to test it.
- [x] kid3: launches, media tags work
- [x] krename: launches, media tags work
- [x] lms: works
- [x] mixxx: update to 2.5.0: launches, media tags work
- [x] mp3unicode: launches
- [x] musikcube: launches, media tags work
- [x] qmmp: update to 1.7.3: launches, media tags work
- [x] quimup: update to 2.1.1: launches fine
- [x] strawberry: update to 1.2.7 - works well, I use it on a daily basis
- [x] tellico: launches
- [x] vimpc: launches, requires mpd
- [x] ncmpcpp: launches, requires mpd
- [x] kasts: launches
- [x] juk: launches, media tags work
- [x] kf6-kfilemetadata: media tags show under properties of a media file
- [x] kodi: launches, media tags work
- [x] gst-plugins-good1: works
- [x] soundkonverter: works
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 101235 bytes --]
From b8500734da0fe47d832c1c5689823189a22fb7a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..6df18bf4ce8e94 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 76c07778b861b0d70342c29435b8ee78caa86db9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 66b2216349615796a76556b57671478321298f2d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From b753bab97b0de8b587958b59ac673ccb3755e38a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 70a63cddb1c9801df7aa1a5aefd69809e0879ec4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 97ebb8145791c484ec5590ad78bd174353fe66ab Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 9fc9056806145c2be929ff6e95a979527f1c72d1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 07e52c79b12cee2c250a9a7d5167aaef8df1bff4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From ee76a8f53c8630b46cec6075a3d38b439c988c3b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.11
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..3676e0d206fbde 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.11
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From ccec9bacf8a6e77005cf75397ec4f9ede7e1b588 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From f2bbc77479226f383ee06b33872bea78951aa62a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 324 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 326 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..c1946ab55d4f44
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,324 @@
+From: =?utf-8?b?QmFsbMOzIEd5w7ZyZ3k=?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+Forwarded: https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/16
+Bug-Debian: https://bugs.debian.org/1092704
+---
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8716331..8772d52 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54d..4f99b24 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c..1728189 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 11 Jan 2025 14:48:46 -0500
+Subject: taglib-2 further fix
+
+Further fix compatibility with taglib 2.x on 32-bit architecture.
+---
+ src/tags/gio_wrapper.cc | 20 ++++++++++----------
+ src/tags/gio_wrapper.h | 20 ++++++++++----------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8772d52..8fdd9e7 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,7 +47,7 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (ulong len)
++GIO_InputStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -95,7 +95,7 @@ GIO_InputStream::isOpen () const
+ }
+
+ void
+-GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_InputStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -133,13 +133,13 @@ GIO_InputStream::clear ()
+ }
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::length ()
+ {
+ if (error)
+@@ -161,7 +161,7 @@ GIO_InputStream::length ()
+ }
+
+ void
+-GIO_InputStream::truncate (long int len)
++GIO_InputStream::truncate (TagLib::offset_t len)
+ {
+ g_warning ("%s", "Trying to truncate read-only file");
+ }
+@@ -200,7 +200,7 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (ulong len)
++GIO_IOStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -400,7 +400,7 @@ GIO_IOStream::isOpen () const
+ }
+
+ void
+-GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_IOStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -434,13 +434,13 @@ GIO_IOStream::clear ()
+ g_clear_error (&error);
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::length ()
+ {
+ long rv = -1;
+@@ -464,7 +464,7 @@ GIO_IOStream::length ()
+ }
+
+ void
+-GIO_IOStream::truncate (long int len)
++GIO_IOStream::truncate (TagLib::offset_t len)
+ {
+ if (error)
+ {
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index 4f99b24..fc634ab 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,17 +33,17 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+@@ -61,17 +61,17 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From 8425ce836eb0f74ec4bb0615ad7261612f6eefa3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: update to 12.0.0, switch to qt6
---
srcpkgs/flacon/template | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..521a39aa9043b6 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,10 +1,11 @@
# Template file for 'flacon'
pkgname=flacon
-version=9.0.0
+version=12.0.0
revision=1
build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="qt5-tools-devel uchardet-devel taglib-devel"
+configure_args="-DUSE_QT6=ON -DUSE_QT5=OFF"
+hostmakedepends="pkg-config qt6-tools"
+makedepends="qt6-tools-devel qt6-widgets uchardet-devel taglib-devel"
depends="ffmpeg hicolor-icon-theme"
short_desc="Audio File Encoder. Splits audio tracks into separate tracks"
maintainer="travankor <travankor@tuta.io>"
@@ -12,10 +13,14 @@ license="LGPL-2.1-or-later"
homepage="https://flacon.github.io/"
changelog="https://flacon.github.io/changelog/"
distfiles="https://github.com/Flacon/flacon/archive/v${version}.tar.gz"
-checksum=a83d5fe297ceb6408b7f63c56a6be336fe1c6d06ebedcc0c84a3f7dd234140e4
+checksum=78199ff925b7cd0ffeb628d47909ca4172f8ff0d8fd8192bb537e0c012e6f4c6
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-qmake"
+ hostmakedepends+=" qt6-base"
+ post_configure() {
+ # use host lrelease instead of target binary which breaks compilation
+ vsed -i build/build.ninja -e "s|${XBPS_CROSS_BASE}/usr/lib.*/qt6/bin/lrelease|/usr/lib/qt6/bin/lrelease|g"
+ }
fi
post_install() {
From da1d9b0abede1c7853d2741198ae9ae83d20d7f9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..7bfbfb3ef4e905 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,24 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+configure_args="-DWITH_SYSTEMD=OFF -DWITH_AVCODEC=ON -DWITH_NPUPNP=ON"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
- libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ libexif-devel libnpupnp-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
-
-# libupnp uses large file support, so users must do that, too
-CXXFLAGS="-D_FILE_OFFSET_BITS=64"
-
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
system_accounts="gerbera"
make_dirs="/var/lib/gerbera 0750 gerbera gerbera"
From e893e40242968a944cfb90e093e69941fb3064cf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From d09fa945a7857f4ad601960aa9ffeedd1b6e9d09 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 15/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 5a692bf3fc8552fee401e236817026b57799230f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 16/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 85d5ed1a00032157dee1966fcf7458c4068d793b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 17/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From ae81ef0ff6742fd5e4c57f75668a5dcc8cd41e18 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 18/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From 8eb79bfcafe615feecb71f14b02ab96cb414a0e0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 19/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 019333d34da5f36a7181dcb44138e60530db9284 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 20/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From b44045cb26448b273608d70de6584084d959f3dc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 21/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 39bff055d2832ac2e0f80dfe212acace29a5f9e6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 22/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From 4292ab654374920432c1fd0062427667dbd76055 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 23/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 964ce05422b2023919c3af42541a1ae9439cc097 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 24/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From 5d7da815dccfc655ab1a330fb6d0842befc03a60 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 25/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 452418c54b603bb3af41da9b23ade762605ffcff Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 26/41] strawberry: update to 1.2.9
---
srcpkgs/strawberry/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..9d9858f14aacbf 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.9
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,9 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel
+ rapidjson sparsehash"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +18,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=7099a35973d2551489ebbf6f33487169134e57fb292a4aeed07e68aa8d939e76
From e375e60561f4d6f3482bcc5c92ac6c9da7b8f572 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 27/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From ee344e1178a1cff38eb2f1246cf086336f715494 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 28/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From ea7cfe6a27ed8318402352cba065adb1e6415bba Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 29/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6df18bf4ce8e94..4bbebb4702336a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1232,8 +1232,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83e1a512c29cc0..02a0366339088a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -458,6 +458,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From bac65591ca2c5767b825ed25c4ee733b258b3047 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 30/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 02a0366339088a..c58ee66bb5ee18 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -493,6 +493,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 14328cd15a9b25d06938086da0ab0852bb1a420f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 31/41] ncmpcpp: update to 0.10.1, use taglib2
---
srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ----------------
srcpkgs/ncmpcpp/template | 20 ++++++++++----------
2 files changed, 10 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/ncmpcpp/patches/socket-inode.patch
diff --git a/srcpkgs/ncmpcpp/patches/socket-inode.patch b/srcpkgs/ncmpcpp/patches/socket-inode.patch
deleted file mode 100644
index 6bf92146ea0914..00000000000000
--- a/srcpkgs/ncmpcpp/patches/socket-inode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Support sockets without a socket inode
-# https://github.com/ncmpcpp/ncmpcpp/commit/40e4f98ee896ea10967eb1c4323bb718331eabea
-diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
-index ccdee31d..9a92e5df 100644
---- a/src/mpdpp.cpp
-+++ b/src/mpdpp.cpp
-@@ -147,7 +147,7 @@ unsigned Connection::Version() const
- void Connection::SetHostname(const std::string &host)
- {
- size_t at = host.find("@");
-- if (at != std::string::npos)
-+ if (at != 0 && at != std::string::npos)
- {
- m_password = host.substr(0, at);
- m_host = host.substr(at+1);
-
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..b0fba7f09df2a8 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,25 +1,25 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
-version=0.9.2
-revision=11
+version=0.10.1
+revision=1
build_style=gnu-configure
-configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
-hostmakedepends="pkg-config"
-makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+configure_args=" --enable-clock --enable-outputs --enable-unicode
+ --enable-visualizer --with-curl --with-taglib --with-fftw"
+hostmakedepends="automake libtool pkg-config"
+makedepends="boost-devel fftw-devel icu-devel libcurl-devel libltdl-devel
+ libmpdclient-devel readline-devel taglib-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://rybczak.net/ncmpcpp"
-distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
+distfiles="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${version}.tar.gz"
+checksum=ddc89da86595d272282ae8726cc7913867b9517eec6e765e66e6da860b58e2f9
# Required by waddwstr() with ncurses on musl
CXXFLAGS="-D_XOPEN_SOURCE=600"
pre_configure() {
- vsed -e '/^docdir/d' -i {,doc/}Makefile.in
+ autoreconf -fiv
}
post_install() {
From 06820252df718b6ea4d7a77f553fe89d0b153ea6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 32/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 69dff25ed9899a14b6a2cbef7c0a3824ceb8012c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 33/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From 3ef0e7cf3e715ca4241ad7f5699a925b3041c423 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 34/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 7ec009e856b4c8d9eac99844e18eddf68ba83e81 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 35/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From cc77a11766f0cb2d50ddd91d455522b88e5199ca Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 36/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 24877fbd8e79c402f3e5303b227ae9a79e304b73 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 37/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From a89051c4e1d7b098b439ca27b54eaa430a8a7ddf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 19 Mar 2025 14:47:49 +0100
Subject: [PATCH 38/41] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=3
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
From 04967ccf8873c4bb778fa0bbc9e2fec27babb4e3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Mar 2025 14:15:46 +0100
Subject: [PATCH 39/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 34024aff716797..dadf10f47925fa 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.11
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From f04d2c17d6200cd1530eaf63353419651002729e Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 6 Apr 2025 16:50:13 +0200
Subject: [PATCH 40/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c58ee66bb5ee18..c4de45c97be7c2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -318,6 +318,7 @@ replaces="
icecat<=78.6.1_1
icu4lua-devel<=0.2B_14
icu4lua<=0.2B_14
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From f3cc0ab5c24c8623964216343b7f6dc17c5489c0 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 7 Apr 2025 15:48:03 +0200
Subject: [PATCH 41/41] soundkonverter: patch for taglib2
---
srcpkgs/soundkonverter/patches/taglib2.diff | 259 ++++++++++++++++++++
srcpkgs/soundkonverter/template | 2 +-
2 files changed, 260 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/soundkonverter/patches/taglib2.diff
diff --git a/srcpkgs/soundkonverter/patches/taglib2.diff b/srcpkgs/soundkonverter/patches/taglib2.diff
new file mode 100644
index 00000000000000..6e24af2ec99250
--- /dev/null
+++ b/srcpkgs/soundkonverter/patches/taglib2.diff
@@ -0,0 +1,259 @@
+diff --git a/src/metadata/tagengine.cpp b/src/metadata/tagengine.cpp
+index 4056d676..0aa48b26 100644
+--- a/src/metadata/tagengine.cpp
++++ b/src/metadata/tagengine.cpp
+@@ -367,8 +367,8 @@ TagData* TagEngine::readTags( const KUrl& fileName )
+
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "aART" )
+ {
+@@ -680,7 +680,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -688,7 +688,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -698,7 +698,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -711,7 +711,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -721,7 +721,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -734,7 +734,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -742,7 +742,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -755,7 +755,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -763,7 +763,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -773,7 +773,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -786,7 +786,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -796,7 +796,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -809,7 +809,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -817,7 +817,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -830,7 +830,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -838,7 +838,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -848,7 +848,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -861,7 +861,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -871,7 +871,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -884,7 +884,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -892,7 +892,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -903,27 +903,27 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+ if( !tagData->albumArtist.isEmpty() )
+- tag->itemListMap()["aART"] = TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("aART", TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->composer.isEmpty() )
+- tag->itemListMap()["\xA9wrt"] = TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("\xA9wrt", TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( tagData->trackTotal > 0 )
+- tag->itemListMap()["trkn"] = TagLib::MP4::Item( tagData->track, tagData->trackTotal );
++ tag->setItem("trkn", TagLib::MP4::Item( tagData->track, tagData->trackTotal ));
+
+ if( tagData->disc > 0 )
+ {
+ if( tagData->discTotal > 0 )
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc, tagData->discTotal );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc, tagData->discTotal ));
+ else
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc ));
+ }
+
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Track Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Track Id", TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Album Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Album Id", TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8)));
+ }
+ }
+ else if( TagLib::ASF::File *file = dynamic_cast<TagLib::ASF::File*>(fileref.file()) )
+@@ -1136,8 +1136,8 @@ QList<CoverData*> TagEngine::readCovers( const KUrl& fileName )
+ {
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "covr" )
+ {
+@@ -1290,7 +1290,7 @@ bool TagEngine::writeCovers( const KUrl& fileName, QList<CoverData*> covers )
+
+ coversList.append( TagLib::MP4::CoverArt( format, TagLib::ByteVector( cover->data.data(), cover->data.size() ) ) );
+ }
+- tag->itemListMap()["covr"] = TagLib::MP4::Item( coversList );
++ tag->setItem("covr", TagLib::MP4::Item( coversList ));
+ }
+
+ return fileref.save();
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
index e11cd96426472b..f31ba5a0c158a0 100644
--- a/srcpkgs/soundkonverter/template
+++ b/srcpkgs/soundkonverter/template
@@ -1,7 +1,7 @@
# Template file for 'soundkonverter'
pkgname=soundkonverter
version=3.0.1
-revision=2
+revision=3
build_wrksrc=src
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (59 preceding siblings ...)
2025-04-16 20:28 ` slymattz
@ 2025-04-16 20:32 ` slymattz
2025-04-16 20:33 ` slymattz
` (34 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-04-16 20:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5886 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Motivation for upgrading taglib
[https://taglib.org/older.html](https://taglib.org/older.html):
> New major version, binary incompatible, but mostly source-compatible with the latest 1.x release if no deprecated features are used. Simple applications should build without changes, more complex applications (e.g. extending classes of TagLib) will have to be adapted.
I believe more complex applications will soon/already do require taglib2. Other distros typically have both packages: taglib1 and taglib. For now, a little patching is needed but I bet future releases of "more complex applications" will use taglib2 by default as it's been around for ca. 1.5 years. Taglib1 no longer receives updates and it would be needed for just a handful of apps (see removed apps below), so I'm not sure if taglib1 would make sense in Void, especially because of alternative packages available in the repo which serve the purpose.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
EDIT 3/19/25: resolved a base conflict (updated kodi to 21.2 as 21.1 wouldn't build for i686).
EDIT 3/26/25: resolve a gst-plugins-good1 conflict
EDIT 4/6/25: resolved a base conflict with removed-packages and added the `-DWITH_NPUPNP=ON` flag to gerbera
EDIT: 4/7/25: applied a patch to soundkonverter for compatibility with taglib2
EDIT: 4/16/25: flacon updated to 12.0.0 and switched to qt6
[ci skip for now]
#### About removed packages:
1. loudgain: soundkonverter is said to do ReplayGain calculations. Alternatively, loudgain could be replaced with rsgain (not packaged in Void at this time.) This works:
```
# Template file for 'rsgain'
pkgname=rsgain
version=3.6
revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="ffmpeg-devel fmt-devel taglib-devel libebur128-devel inih-devel"
short_desc="Simple, but powerful ReplayGain 2.0 tagging utility"
maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/complexlogic/rsgain"
distfiles="https://github.com/complexlogic/rsgain/archive/refs/tags/v${version}.tar.gz"
checksum=26f7acd1ba0851929dc756c93b3b1a6d66d7f2f36b31f744c8181f14d7b5c8a7
post_install() {
vlicense LICENSE
vlicense LICENSE-CRCpp
}
```
2. id3ted: there are plenty of alternatives, be it GUI-based or CLI. In the repo there's kid3, picard or puddletag, for instance.
3. libtaginfo: there are alternatives like python3-mutagen or ffmpeg etc.
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
#### Testing individual packages:
- [x] ario
- [x] moc: mocp launches, media tags work
- [x] parole: launches, media tags work
- [x] pragha: launches, media tags work
- [x] thunar-media-tags-plugin: editing tags in thunar works
- [x] QMPlay2: launches, media tags work
- [x] ardour: launches, allows for the editing of metadata
- [x] clementine: launches, media tags work
- [x] easytag: launches, media tags work
- [x] flacon: launches, media tags work
- [x] gerbera: update to 2.5.0 - works well, I use it on a daily basis
- [x] gogglesmm: launches, media tags work
- [x] k3b: launches and works fine
- [x] vlc: launches, media tags work
- [x] kfilemetadata5: I guess it works. I'm not sure how to test it.
- [x] kid3: launches, media tags work
- [x] krename: launches, media tags work
- [x] lms: works
- [x] mixxx: update to 2.5.0: launches, media tags work
- [x] mp3unicode: launches
- [x] musikcube: launches, media tags work
- [x] qmmp: update to 1.7.3: launches, media tags work
- [x] quimup: update to 2.1.1: launches fine
- [x] strawberry: update to 1.2.7 - works well, I use it on a daily basis
- [x] tellico: launches
- [x] vimpc: launches, requires mpd
- [x] ncmpcpp: launches, requires mpd
- [x] kasts: launches
- [x] juk: launches, media tags work
- [x] kf6-kfilemetadata: media tags show under properties of a media file
- [x] kodi: launches, media tags work
- [x] gst-plugins-good1: works
- [x] soundkonverter: works
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 101235 bytes --]
From b8500734da0fe47d832c1c5689823189a22fb7a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..6df18bf4ce8e94 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 76c07778b861b0d70342c29435b8ee78caa86db9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 66b2216349615796a76556b57671478321298f2d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From b753bab97b0de8b587958b59ac673ccb3755e38a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 70a63cddb1c9801df7aa1a5aefd69809e0879ec4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 97ebb8145791c484ec5590ad78bd174353fe66ab Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 9fc9056806145c2be929ff6e95a979527f1c72d1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 07e52c79b12cee2c250a9a7d5167aaef8df1bff4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From 0f068daa1d1573b85271eda54407a391361100c7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.12
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..8b25f3b6385864 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.12
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From c793fbea650ebc2f2bcbc0fdd2c0585bc627fb17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 0cafb9c80c163e8270ad053e4da0d8ddad8739ce Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 324 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 326 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..c1946ab55d4f44
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,324 @@
+From: =?utf-8?b?QmFsbMOzIEd5w7ZyZ3k=?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+Forwarded: https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/16
+Bug-Debian: https://bugs.debian.org/1092704
+---
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8716331..8772d52 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54d..4f99b24 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c..1728189 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 11 Jan 2025 14:48:46 -0500
+Subject: taglib-2 further fix
+
+Further fix compatibility with taglib 2.x on 32-bit architecture.
+---
+ src/tags/gio_wrapper.cc | 20 ++++++++++----------
+ src/tags/gio_wrapper.h | 20 ++++++++++----------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8772d52..8fdd9e7 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,7 +47,7 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (ulong len)
++GIO_InputStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -95,7 +95,7 @@ GIO_InputStream::isOpen () const
+ }
+
+ void
+-GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_InputStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -133,13 +133,13 @@ GIO_InputStream::clear ()
+ }
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::length ()
+ {
+ if (error)
+@@ -161,7 +161,7 @@ GIO_InputStream::length ()
+ }
+
+ void
+-GIO_InputStream::truncate (long int len)
++GIO_InputStream::truncate (TagLib::offset_t len)
+ {
+ g_warning ("%s", "Trying to truncate read-only file");
+ }
+@@ -200,7 +200,7 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (ulong len)
++GIO_IOStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -400,7 +400,7 @@ GIO_IOStream::isOpen () const
+ }
+
+ void
+-GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_IOStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -434,13 +434,13 @@ GIO_IOStream::clear ()
+ g_clear_error (&error);
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::length ()
+ {
+ long rv = -1;
+@@ -464,7 +464,7 @@ GIO_IOStream::length ()
+ }
+
+ void
+-GIO_IOStream::truncate (long int len)
++GIO_IOStream::truncate (TagLib::offset_t len)
+ {
+ if (error)
+ {
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index 4f99b24..fc634ab 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,17 +33,17 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+@@ -61,17 +61,17 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From 3c5d73b86c13a2c8d06573de88331eee8cf462bd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: update to 12.0.0, switch to qt6
---
srcpkgs/flacon/template | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..521a39aa9043b6 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,10 +1,11 @@
# Template file for 'flacon'
pkgname=flacon
-version=9.0.0
+version=12.0.0
revision=1
build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="qt5-tools-devel uchardet-devel taglib-devel"
+configure_args="-DUSE_QT6=ON -DUSE_QT5=OFF"
+hostmakedepends="pkg-config qt6-tools"
+makedepends="qt6-tools-devel qt6-widgets uchardet-devel taglib-devel"
depends="ffmpeg hicolor-icon-theme"
short_desc="Audio File Encoder. Splits audio tracks into separate tracks"
maintainer="travankor <travankor@tuta.io>"
@@ -12,10 +13,14 @@ license="LGPL-2.1-or-later"
homepage="https://flacon.github.io/"
changelog="https://flacon.github.io/changelog/"
distfiles="https://github.com/Flacon/flacon/archive/v${version}.tar.gz"
-checksum=a83d5fe297ceb6408b7f63c56a6be336fe1c6d06ebedcc0c84a3f7dd234140e4
+checksum=78199ff925b7cd0ffeb628d47909ca4172f8ff0d8fd8192bb537e0c012e6f4c6
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-qmake"
+ hostmakedepends+=" qt6-base"
+ post_configure() {
+ # use host lrelease instead of target binary which breaks compilation
+ vsed -i build/build.ninja -e "s|${XBPS_CROSS_BASE}/usr/lib.*/qt6/bin/lrelease|/usr/lib/qt6/bin/lrelease|g"
+ }
fi
post_install() {
From 09264a76474cf82067faf1ec19d0687bb8e111f3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..7bfbfb3ef4e905 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,24 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+configure_args="-DWITH_SYSTEMD=OFF -DWITH_AVCODEC=ON -DWITH_NPUPNP=ON"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
- libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ libexif-devel libnpupnp-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
-
-# libupnp uses large file support, so users must do that, too
-CXXFLAGS="-D_FILE_OFFSET_BITS=64"
-
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
system_accounts="gerbera"
make_dirs="/var/lib/gerbera 0750 gerbera gerbera"
From db74ef1376d323355817a2356d783aa53e139aab Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 84250ff754622dad231a6625794322443dc3e376 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 15/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 094a83f4fdae2af529f9d874441a3de1facfec81 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 16/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90a3d8d4c82608e3c283eacebca7b14688e2ecc9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 17/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From c104df44bb699f76047ca048a87c9c0736cb375d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 18/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From e258332af54c7a87da772143d277f0bb913e1567 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 19/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 8c8b5db2e6421bd61bd5bf877157e85670f96c24 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 20/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From cc5c3583cd9cd70f6eef97f1b2de239715472ac6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 21/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 61b26d8935fccf04a977db35bc0677680e7a63c8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 22/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From ff4df5ed77e3a1d6452e3846644820f6feefc42f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 23/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 6c1c95aa471d5a389fe8f27ed045d3676b0f857c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 24/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From df9a87438577e4b99e32cc6e546b341e35ad2c9b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 25/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 03c2a6de5ad79503d14993139cd479bed50f60ae Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 26/41] strawberry: update to 1.2.9
---
srcpkgs/strawberry/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..9d9858f14aacbf 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.9
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,9 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel
+ rapidjson sparsehash"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +18,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=7099a35973d2551489ebbf6f33487169134e57fb292a4aeed07e68aa8d939e76
From 29701b430564dba16ef4306a8a97cba0bc7ecc6c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 27/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From e849f1ba853e7de8a45240002494b0543c6de66d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 28/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From e326e3fc81498ed6f511143fca8184639e7f95fc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 29/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6df18bf4ce8e94..4bbebb4702336a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1232,8 +1232,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83e1a512c29cc0..02a0366339088a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -458,6 +458,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From 507adbf5261ef32309963a431f6f4aa2e5bc94e4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 30/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 02a0366339088a..c58ee66bb5ee18 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -493,6 +493,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 0aca8ac2cbb2e100df1915b72530c1f44ff09455 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 31/41] ncmpcpp: update to 0.10.1, use taglib2
---
srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ----------------
srcpkgs/ncmpcpp/template | 20 ++++++++++----------
2 files changed, 10 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/ncmpcpp/patches/socket-inode.patch
diff --git a/srcpkgs/ncmpcpp/patches/socket-inode.patch b/srcpkgs/ncmpcpp/patches/socket-inode.patch
deleted file mode 100644
index 6bf92146ea0914..00000000000000
--- a/srcpkgs/ncmpcpp/patches/socket-inode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Support sockets without a socket inode
-# https://github.com/ncmpcpp/ncmpcpp/commit/40e4f98ee896ea10967eb1c4323bb718331eabea
-diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
-index ccdee31d..9a92e5df 100644
---- a/src/mpdpp.cpp
-+++ b/src/mpdpp.cpp
-@@ -147,7 +147,7 @@ unsigned Connection::Version() const
- void Connection::SetHostname(const std::string &host)
- {
- size_t at = host.find("@");
-- if (at != std::string::npos)
-+ if (at != 0 && at != std::string::npos)
- {
- m_password = host.substr(0, at);
- m_host = host.substr(at+1);
-
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..b0fba7f09df2a8 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,25 +1,25 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
-version=0.9.2
-revision=11
+version=0.10.1
+revision=1
build_style=gnu-configure
-configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
-hostmakedepends="pkg-config"
-makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+configure_args=" --enable-clock --enable-outputs --enable-unicode
+ --enable-visualizer --with-curl --with-taglib --with-fftw"
+hostmakedepends="automake libtool pkg-config"
+makedepends="boost-devel fftw-devel icu-devel libcurl-devel libltdl-devel
+ libmpdclient-devel readline-devel taglib-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://rybczak.net/ncmpcpp"
-distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
+distfiles="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${version}.tar.gz"
+checksum=ddc89da86595d272282ae8726cc7913867b9517eec6e765e66e6da860b58e2f9
# Required by waddwstr() with ncurses on musl
CXXFLAGS="-D_XOPEN_SOURCE=600"
pre_configure() {
- vsed -e '/^docdir/d' -i {,doc/}Makefile.in
+ autoreconf -fiv
}
post_install() {
From 4b372d7e071c5f77ac66a557dc11c90a8d30547b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 32/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 409f525e7fd4490af3b9b551a0dcee5d8cc285fa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 33/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From 9ddb8f7f92e091cf13bfa53efedc96481287375c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 34/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 4d95ea1e377891ad01d8ee497f521a1229c8df18 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 35/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 1b1bfdbea4f6662f919a75bdb61b20d826deb19c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 36/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From b6aecd45f4ae4d7de6693d53bc56e7d54d7a4caf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 37/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From d18f9df03855e2beb9163046d8177688587826b9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 19 Mar 2025 14:47:49 +0100
Subject: [PATCH 38/41] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=3
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
From 6d656ae235df12f309c4d72b147a3efabebf2f40 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Mar 2025 14:15:46 +0100
Subject: [PATCH 39/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 34024aff716797..dadf10f47925fa 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.11
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 52f1d359a35bfa8fc5830e51faa3c2da99af59cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 6 Apr 2025 16:50:13 +0200
Subject: [PATCH 40/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c58ee66bb5ee18..c4de45c97be7c2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -318,6 +318,7 @@ replaces="
icecat<=78.6.1_1
icu4lua-devel<=0.2B_14
icu4lua<=0.2B_14
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 51b8f5692df25c1d5ff954e5d1f22292971d2805 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 7 Apr 2025 15:48:03 +0200
Subject: [PATCH 41/41] soundkonverter: patch for taglib2
---
srcpkgs/soundkonverter/patches/taglib2.diff | 259 ++++++++++++++++++++
srcpkgs/soundkonverter/template | 2 +-
2 files changed, 260 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/soundkonverter/patches/taglib2.diff
diff --git a/srcpkgs/soundkonverter/patches/taglib2.diff b/srcpkgs/soundkonverter/patches/taglib2.diff
new file mode 100644
index 00000000000000..6e24af2ec99250
--- /dev/null
+++ b/srcpkgs/soundkonverter/patches/taglib2.diff
@@ -0,0 +1,259 @@
+diff --git a/src/metadata/tagengine.cpp b/src/metadata/tagengine.cpp
+index 4056d676..0aa48b26 100644
+--- a/src/metadata/tagengine.cpp
++++ b/src/metadata/tagengine.cpp
+@@ -367,8 +367,8 @@ TagData* TagEngine::readTags( const KUrl& fileName )
+
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "aART" )
+ {
+@@ -680,7 +680,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -688,7 +688,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -698,7 +698,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -711,7 +711,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -721,7 +721,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -734,7 +734,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -742,7 +742,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -755,7 +755,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -763,7 +763,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -773,7 +773,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -786,7 +786,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -796,7 +796,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -809,7 +809,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -817,7 +817,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -830,7 +830,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -838,7 +838,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -848,7 +848,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -861,7 +861,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -871,7 +871,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -884,7 +884,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -892,7 +892,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -903,27 +903,27 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+ if( !tagData->albumArtist.isEmpty() )
+- tag->itemListMap()["aART"] = TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("aART", TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->composer.isEmpty() )
+- tag->itemListMap()["\xA9wrt"] = TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("\xA9wrt", TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( tagData->trackTotal > 0 )
+- tag->itemListMap()["trkn"] = TagLib::MP4::Item( tagData->track, tagData->trackTotal );
++ tag->setItem("trkn", TagLib::MP4::Item( tagData->track, tagData->trackTotal ));
+
+ if( tagData->disc > 0 )
+ {
+ if( tagData->discTotal > 0 )
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc, tagData->discTotal );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc, tagData->discTotal ));
+ else
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc ));
+ }
+
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Track Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Track Id", TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Album Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Album Id", TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8)));
+ }
+ }
+ else if( TagLib::ASF::File *file = dynamic_cast<TagLib::ASF::File*>(fileref.file()) )
+@@ -1136,8 +1136,8 @@ QList<CoverData*> TagEngine::readCovers( const KUrl& fileName )
+ {
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "covr" )
+ {
+@@ -1290,7 +1290,7 @@ bool TagEngine::writeCovers( const KUrl& fileName, QList<CoverData*> covers )
+
+ coversList.append( TagLib::MP4::CoverArt( format, TagLib::ByteVector( cover->data.data(), cover->data.size() ) ) );
+ }
+- tag->itemListMap()["covr"] = TagLib::MP4::Item( coversList );
++ tag->setItem("covr", TagLib::MP4::Item( coversList ));
+ }
+
+ return fileref.save();
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
index e11cd96426472b..f31ba5a0c158a0 100644
--- a/srcpkgs/soundkonverter/template
+++ b/srcpkgs/soundkonverter/template
@@ -1,7 +1,7 @@
# Template file for 'soundkonverter'
pkgname=soundkonverter
version=3.0.1
-revision=2
+revision=3
build_wrksrc=src
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (60 preceding siblings ...)
2025-04-16 20:32 ` slymattz
@ 2025-04-16 20:33 ` slymattz
2025-04-16 21:29 ` slymattz
` (33 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-04-16 20:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5898 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Motivation for upgrading taglib
[https://taglib.org/older.html](https://taglib.org/older.html):
> New major version, binary incompatible, but mostly source-compatible with the latest 1.x release if no deprecated features are used. Simple applications should build without changes, more complex applications (e.g. extending classes of TagLib) will have to be adapted.
I believe more complex applications will soon/already do require taglib2. Other distros typically have both packages: taglib1 and taglib. For now, a little patching is needed but I bet future releases of "more complex applications" will use taglib2 by default as it's been around for ca. 1.5 years. Taglib1 no longer receives updates and it would be needed for just a handful of apps (see removed apps below), so I'm not sure if taglib1 would make sense in Void, especially because of alternative packages available in the repo which serve the purpose.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
EDIT 3/19/25: resolved a base conflict (updated kodi to 21.2 as 21.1 wouldn't build for i686).
EDIT 3/26/25: resolve a gst-plugins-good1 conflict
EDIT 4/6/25: resolved a base conflict with removed-packages and added the `-DWITH_NPUPNP=ON` flag to gerbera
EDIT: 4/7/25: applied a patch to soundkonverter for compatibility with taglib2
EDIT: 4/16/25: flacon updated to 12.0.0 and switched to qt6; strawberry updated to 1.2.9
#### About removed packages:
1. loudgain: soundkonverter is said to do ReplayGain calculations. Alternatively, loudgain could be replaced with rsgain (not packaged in Void at this time.) This works:
```
# Template file for 'rsgain'
pkgname=rsgain
version=3.6
revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="ffmpeg-devel fmt-devel taglib-devel libebur128-devel inih-devel"
short_desc="Simple, but powerful ReplayGain 2.0 tagging utility"
maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/complexlogic/rsgain"
distfiles="https://github.com/complexlogic/rsgain/archive/refs/tags/v${version}.tar.gz"
checksum=26f7acd1ba0851929dc756c93b3b1a6d66d7f2f36b31f744c8181f14d7b5c8a7
post_install() {
vlicense LICENSE
vlicense LICENSE-CRCpp
}
```
2. id3ted: there are plenty of alternatives, be it GUI-based or CLI. In the repo there's kid3, picard or puddletag, for instance.
3. libtaginfo: there are alternatives like python3-mutagen or ffmpeg etc.
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
#### Testing individual packages:
- [x] ario
- [x] moc: mocp launches, media tags work
- [x] parole: launches, media tags work
- [x] pragha: launches, media tags work
- [x] thunar-media-tags-plugin: editing tags in thunar works
- [x] QMPlay2: launches, media tags work
- [x] ardour: launches, allows for the editing of metadata
- [x] clementine: launches, media tags work
- [x] easytag: launches, media tags work
- [x] flacon: launches, media tags work
- [x] gerbera: update to 2.5.0 - works well, I use it on a daily basis
- [x] gogglesmm: launches, media tags work
- [x] k3b: launches and works fine
- [x] vlc: launches, media tags work
- [x] kfilemetadata5: I guess it works. I'm not sure how to test it.
- [x] kid3: launches, media tags work
- [x] krename: launches, media tags work
- [x] lms: works
- [x] mixxx: update to 2.5.0: launches, media tags work
- [x] mp3unicode: launches
- [x] musikcube: launches, media tags work
- [x] qmmp: update to 1.7.3: launches, media tags work
- [x] quimup: update to 2.1.1: launches fine
- [x] strawberry: update to 1.2.7 - works well, I use it on a daily basis
- [x] tellico: launches
- [x] vimpc: launches, requires mpd
- [x] ncmpcpp: launches, requires mpd
- [x] kasts: launches
- [x] juk: launches, media tags work
- [x] kf6-kfilemetadata: media tags show under properties of a media file
- [x] kodi: launches, media tags work
- [x] gst-plugins-good1: works
- [x] soundkonverter: works
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 101235 bytes --]
From b8500734da0fe47d832c1c5689823189a22fb7a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..6df18bf4ce8e94 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 76c07778b861b0d70342c29435b8ee78caa86db9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 66b2216349615796a76556b57671478321298f2d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From b753bab97b0de8b587958b59ac673ccb3755e38a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 70a63cddb1c9801df7aa1a5aefd69809e0879ec4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 97ebb8145791c484ec5590ad78bd174353fe66ab Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 9fc9056806145c2be929ff6e95a979527f1c72d1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/41] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 07e52c79b12cee2c250a9a7d5167aaef8df1bff4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/41] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From 0f068daa1d1573b85271eda54407a391361100c7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/41] ardour: update to 8.12
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..8b25f3b6385864 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.12
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From c793fbea650ebc2f2bcbc0fdd2c0585bc627fb17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/41] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 0cafb9c80c163e8270ad053e4da0d8ddad8739ce Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/41] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 324 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 326 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..c1946ab55d4f44
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,324 @@
+From: =?utf-8?b?QmFsbMOzIEd5w7ZyZ3k=?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+Forwarded: https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/16
+Bug-Debian: https://bugs.debian.org/1092704
+---
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8716331..8772d52 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54d..4f99b24 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c..1728189 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 11 Jan 2025 14:48:46 -0500
+Subject: taglib-2 further fix
+
+Further fix compatibility with taglib 2.x on 32-bit architecture.
+---
+ src/tags/gio_wrapper.cc | 20 ++++++++++----------
+ src/tags/gio_wrapper.h | 20 ++++++++++----------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8772d52..8fdd9e7 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,7 +47,7 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (ulong len)
++GIO_InputStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -95,7 +95,7 @@ GIO_InputStream::isOpen () const
+ }
+
+ void
+-GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_InputStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -133,13 +133,13 @@ GIO_InputStream::clear ()
+ }
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::length ()
+ {
+ if (error)
+@@ -161,7 +161,7 @@ GIO_InputStream::length ()
+ }
+
+ void
+-GIO_InputStream::truncate (long int len)
++GIO_InputStream::truncate (TagLib::offset_t len)
+ {
+ g_warning ("%s", "Trying to truncate read-only file");
+ }
+@@ -200,7 +200,7 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (ulong len)
++GIO_IOStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -400,7 +400,7 @@ GIO_IOStream::isOpen () const
+ }
+
+ void
+-GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_IOStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -434,13 +434,13 @@ GIO_IOStream::clear ()
+ g_clear_error (&error);
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::length ()
+ {
+ long rv = -1;
+@@ -464,7 +464,7 @@ GIO_IOStream::length ()
+ }
+
+ void
+-GIO_IOStream::truncate (long int len)
++GIO_IOStream::truncate (TagLib::offset_t len)
+ {
+ if (error)
+ {
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index 4f99b24..fc634ab 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,17 +33,17 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+@@ -61,17 +61,17 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From 3c5d73b86c13a2c8d06573de88331eee8cf462bd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/41] flacon: update to 12.0.0, switch to qt6
---
srcpkgs/flacon/template | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..521a39aa9043b6 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,10 +1,11 @@
# Template file for 'flacon'
pkgname=flacon
-version=9.0.0
+version=12.0.0
revision=1
build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="qt5-tools-devel uchardet-devel taglib-devel"
+configure_args="-DUSE_QT6=ON -DUSE_QT5=OFF"
+hostmakedepends="pkg-config qt6-tools"
+makedepends="qt6-tools-devel qt6-widgets uchardet-devel taglib-devel"
depends="ffmpeg hicolor-icon-theme"
short_desc="Audio File Encoder. Splits audio tracks into separate tracks"
maintainer="travankor <travankor@tuta.io>"
@@ -12,10 +13,14 @@ license="LGPL-2.1-or-later"
homepage="https://flacon.github.io/"
changelog="https://flacon.github.io/changelog/"
distfiles="https://github.com/Flacon/flacon/archive/v${version}.tar.gz"
-checksum=a83d5fe297ceb6408b7f63c56a6be336fe1c6d06ebedcc0c84a3f7dd234140e4
+checksum=78199ff925b7cd0ffeb628d47909ca4172f8ff0d8fd8192bb537e0c012e6f4c6
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-qmake"
+ hostmakedepends+=" qt6-base"
+ post_configure() {
+ # use host lrelease instead of target binary which breaks compilation
+ vsed -i build/build.ninja -e "s|${XBPS_CROSS_BASE}/usr/lib.*/qt6/bin/lrelease|/usr/lib/qt6/bin/lrelease|g"
+ }
fi
post_install() {
From 09264a76474cf82067faf1ec19d0687bb8e111f3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/41] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..7bfbfb3ef4e905 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,24 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+configure_args="-DWITH_SYSTEMD=OFF -DWITH_AVCODEC=ON -DWITH_NPUPNP=ON"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
- libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ libexif-devel libnpupnp-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
-
-# libupnp uses large file support, so users must do that, too
-CXXFLAGS="-D_FILE_OFFSET_BITS=64"
-
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
system_accounts="gerbera"
make_dirs="/var/lib/gerbera 0750 gerbera gerbera"
From db74ef1376d323355817a2356d783aa53e139aab Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/41] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 84250ff754622dad231a6625794322443dc3e376 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 15/41] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 094a83f4fdae2af529f9d874441a3de1facfec81 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 16/41] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90a3d8d4c82608e3c283eacebca7b14688e2ecc9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 17/41] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From c104df44bb699f76047ca048a87c9c0736cb375d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 18/41] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From e258332af54c7a87da772143d277f0bb913e1567 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 19/41] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 8c8b5db2e6421bd61bd5bf877157e85670f96c24 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 20/41] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From cc5c3583cd9cd70f6eef97f1b2de239715472ac6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 21/41] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 61b26d8935fccf04a977db35bc0677680e7a63c8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 22/41] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From ff4df5ed77e3a1d6452e3846644820f6feefc42f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 23/41] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 6c1c95aa471d5a389fe8f27ed045d3676b0f857c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 24/41] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From df9a87438577e4b99e32cc6e546b341e35ad2c9b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 25/41] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 03c2a6de5ad79503d14993139cd479bed50f60ae Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 26/41] strawberry: update to 1.2.9
---
srcpkgs/strawberry/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..9d9858f14aacbf 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.9
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,9 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel
+ rapidjson sparsehash"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +18,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=7099a35973d2551489ebbf6f33487169134e57fb292a4aeed07e68aa8d939e76
From 29701b430564dba16ef4306a8a97cba0bc7ecc6c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 27/41] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From e849f1ba853e7de8a45240002494b0543c6de66d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 28/41] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From e326e3fc81498ed6f511143fca8184639e7f95fc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 29/41] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6df18bf4ce8e94..4bbebb4702336a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1232,8 +1232,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83e1a512c29cc0..02a0366339088a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -458,6 +458,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From 507adbf5261ef32309963a431f6f4aa2e5bc94e4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 30/41] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 02a0366339088a..c58ee66bb5ee18 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -493,6 +493,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 0aca8ac2cbb2e100df1915b72530c1f44ff09455 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 31/41] ncmpcpp: update to 0.10.1, use taglib2
---
srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ----------------
srcpkgs/ncmpcpp/template | 20 ++++++++++----------
2 files changed, 10 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/ncmpcpp/patches/socket-inode.patch
diff --git a/srcpkgs/ncmpcpp/patches/socket-inode.patch b/srcpkgs/ncmpcpp/patches/socket-inode.patch
deleted file mode 100644
index 6bf92146ea0914..00000000000000
--- a/srcpkgs/ncmpcpp/patches/socket-inode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Support sockets without a socket inode
-# https://github.com/ncmpcpp/ncmpcpp/commit/40e4f98ee896ea10967eb1c4323bb718331eabea
-diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
-index ccdee31d..9a92e5df 100644
---- a/src/mpdpp.cpp
-+++ b/src/mpdpp.cpp
-@@ -147,7 +147,7 @@ unsigned Connection::Version() const
- void Connection::SetHostname(const std::string &host)
- {
- size_t at = host.find("@");
-- if (at != std::string::npos)
-+ if (at != 0 && at != std::string::npos)
- {
- m_password = host.substr(0, at);
- m_host = host.substr(at+1);
-
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..b0fba7f09df2a8 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,25 +1,25 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
-version=0.9.2
-revision=11
+version=0.10.1
+revision=1
build_style=gnu-configure
-configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
-hostmakedepends="pkg-config"
-makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+configure_args=" --enable-clock --enable-outputs --enable-unicode
+ --enable-visualizer --with-curl --with-taglib --with-fftw"
+hostmakedepends="automake libtool pkg-config"
+makedepends="boost-devel fftw-devel icu-devel libcurl-devel libltdl-devel
+ libmpdclient-devel readline-devel taglib-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://rybczak.net/ncmpcpp"
-distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
+distfiles="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${version}.tar.gz"
+checksum=ddc89da86595d272282ae8726cc7913867b9517eec6e765e66e6da860b58e2f9
# Required by waddwstr() with ncurses on musl
CXXFLAGS="-D_XOPEN_SOURCE=600"
pre_configure() {
- vsed -e '/^docdir/d' -i {,doc/}Makefile.in
+ autoreconf -fiv
}
post_install() {
From 4b372d7e071c5f77ac66a557dc11c90a8d30547b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 32/41] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 409f525e7fd4490af3b9b551a0dcee5d8cc285fa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 33/41] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From 9ddb8f7f92e091cf13bfa53efedc96481287375c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 34/41] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 4d95ea1e377891ad01d8ee497f521a1229c8df18 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 35/41] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 1b1bfdbea4f6662f919a75bdb61b20d826deb19c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 36/41] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From b6aecd45f4ae4d7de6693d53bc56e7d54d7a4caf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 37/41] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From d18f9df03855e2beb9163046d8177688587826b9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 19 Mar 2025 14:47:49 +0100
Subject: [PATCH 38/41] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=3
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
From 6d656ae235df12f309c4d72b147a3efabebf2f40 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Mar 2025 14:15:46 +0100
Subject: [PATCH 39/41] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 34024aff716797..dadf10f47925fa 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.11
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 52f1d359a35bfa8fc5830e51faa3c2da99af59cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 6 Apr 2025 16:50:13 +0200
Subject: [PATCH 40/41] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c58ee66bb5ee18..c4de45c97be7c2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -318,6 +318,7 @@ replaces="
icecat<=78.6.1_1
icu4lua-devel<=0.2B_14
icu4lua<=0.2B_14
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 03b6f9ee041fc6867e184a24a9e70a31a0b53d11 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 7 Apr 2025 15:48:03 +0200
Subject: [PATCH 41/41] soundkonverter: patch for taglib2
---
srcpkgs/soundkonverter/patches/taglib2.diff | 259 ++++++++++++++++++++
srcpkgs/soundkonverter/template | 2 +-
2 files changed, 260 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/soundkonverter/patches/taglib2.diff
diff --git a/srcpkgs/soundkonverter/patches/taglib2.diff b/srcpkgs/soundkonverter/patches/taglib2.diff
new file mode 100644
index 00000000000000..6e24af2ec99250
--- /dev/null
+++ b/srcpkgs/soundkonverter/patches/taglib2.diff
@@ -0,0 +1,259 @@
+diff --git a/src/metadata/tagengine.cpp b/src/metadata/tagengine.cpp
+index 4056d676..0aa48b26 100644
+--- a/src/metadata/tagengine.cpp
++++ b/src/metadata/tagengine.cpp
+@@ -367,8 +367,8 @@ TagData* TagEngine::readTags( const KUrl& fileName )
+
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "aART" )
+ {
+@@ -680,7 +680,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -688,7 +688,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -698,7 +698,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -711,7 +711,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -721,7 +721,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -734,7 +734,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -742,7 +742,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -755,7 +755,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -763,7 +763,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -773,7 +773,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -786,7 +786,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -796,7 +796,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -809,7 +809,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -817,7 +817,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -830,7 +830,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -838,7 +838,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -848,7 +848,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -861,7 +861,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -871,7 +871,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -884,7 +884,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -892,7 +892,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -903,27 +903,27 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+ if( !tagData->albumArtist.isEmpty() )
+- tag->itemListMap()["aART"] = TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("aART", TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->composer.isEmpty() )
+- tag->itemListMap()["\xA9wrt"] = TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("\xA9wrt", TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( tagData->trackTotal > 0 )
+- tag->itemListMap()["trkn"] = TagLib::MP4::Item( tagData->track, tagData->trackTotal );
++ tag->setItem("trkn", TagLib::MP4::Item( tagData->track, tagData->trackTotal ));
+
+ if( tagData->disc > 0 )
+ {
+ if( tagData->discTotal > 0 )
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc, tagData->discTotal );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc, tagData->discTotal ));
+ else
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc ));
+ }
+
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Track Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Track Id", TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Album Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Album Id", TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8)));
+ }
+ }
+ else if( TagLib::ASF::File *file = dynamic_cast<TagLib::ASF::File*>(fileref.file()) )
+@@ -1136,8 +1136,8 @@ QList<CoverData*> TagEngine::readCovers( const KUrl& fileName )
+ {
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "covr" )
+ {
+@@ -1290,7 +1290,7 @@ bool TagEngine::writeCovers( const KUrl& fileName, QList<CoverData*> covers )
+
+ coversList.append( TagLib::MP4::CoverArt( format, TagLib::ByteVector( cover->data.data(), cover->data.size() ) ) );
+ }
+- tag->itemListMap()["covr"] = TagLib::MP4::Item( coversList );
++ tag->setItem("covr", TagLib::MP4::Item( coversList ));
+ }
+
+ return fileref.save();
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
index e11cd96426472b..f31ba5a0c158a0 100644
--- a/srcpkgs/soundkonverter/template
+++ b/srcpkgs/soundkonverter/template
@@ -1,7 +1,7 @@
# Template file for 'soundkonverter'
pkgname=soundkonverter
version=3.0.1
-revision=2
+revision=3
build_wrksrc=src
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (61 preceding siblings ...)
2025-04-16 20:33 ` slymattz
@ 2025-04-16 21:29 ` slymattz
2025-04-22 8:41 ` slymattz
` (32 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-04-16 21:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 5898 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Motivation for upgrading taglib
[https://taglib.org/older.html](https://taglib.org/older.html):
> New major version, binary incompatible, but mostly source-compatible with the latest 1.x release if no deprecated features are used. Simple applications should build without changes, more complex applications (e.g. extending classes of TagLib) will have to be adapted.
I believe more complex applications will soon/already do require taglib2. Other distros typically have both packages: taglib1 and taglib. For now, a little patching is needed but I bet future releases of "more complex applications" will use taglib2 by default as it's been around for ca. 1.5 years. Taglib1 no longer receives updates and it would be needed for just a handful of apps (see removed apps below), so I'm not sure if taglib1 would make sense in Void, especially because of alternative packages available in the repo which serve the purpose.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
EDIT 3/19/25: resolved a base conflict (updated kodi to 21.2 as 21.1 wouldn't build for i686).
EDIT 3/26/25: resolve a gst-plugins-good1 conflict
EDIT 4/6/25: resolved a base conflict with removed-packages and added the `-DWITH_NPUPNP=ON` flag to gerbera
EDIT: 4/7/25: applied a patch to soundkonverter for compatibility with taglib2
EDIT: 4/16/25: flacon updated to 12.0.0 and switched to qt6; strawberry updated to 1.2.9
#### About removed packages:
1. loudgain: soundkonverter is said to do ReplayGain calculations. Alternatively, loudgain could be replaced with rsgain (not packaged in Void at this time.) This works:
```
# Template file for 'rsgain'
pkgname=rsgain
version=3.6
revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="ffmpeg-devel fmt-devel taglib-devel libebur128-devel inih-devel"
short_desc="Simple, but powerful ReplayGain 2.0 tagging utility"
maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/complexlogic/rsgain"
distfiles="https://github.com/complexlogic/rsgain/archive/refs/tags/v${version}.tar.gz"
checksum=26f7acd1ba0851929dc756c93b3b1a6d66d7f2f36b31f744c8181f14d7b5c8a7
post_install() {
vlicense LICENSE
vlicense LICENSE-CRCpp
}
```
2. id3ted: there are plenty of alternatives, be it GUI-based or CLI. In the repo there's kid3, picard or puddletag, for instance.
3. libtaginfo: there are alternatives like python3-mutagen or ffmpeg etc.
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
#### Testing individual packages:
- [x] ario
- [x] moc: mocp launches, media tags work
- [x] parole: launches, media tags work
- [x] pragha: launches, media tags work
- [x] thunar-media-tags-plugin: editing tags in thunar works
- [x] QMPlay2: launches, media tags work
- [x] ardour: launches, allows for the editing of metadata
- [x] clementine: launches, media tags work
- [x] easytag: launches, media tags work
- [x] flacon: launches, media tags work
- [x] gerbera: update to 2.5.0 - works well, I use it on a daily basis
- [x] gogglesmm: launches, media tags work
- [x] k3b: launches and works fine
- [x] vlc: launches, media tags work
- [x] kfilemetadata5: I guess it works. I'm not sure how to test it.
- [x] kid3: launches, media tags work
- [x] krename: launches, media tags work
- [x] lms: works
- [x] mixxx: update to 2.5.0: launches, media tags work
- [x] mp3unicode: launches
- [x] musikcube: launches, media tags work
- [x] qmmp: update to 1.7.3: launches, media tags work
- [x] quimup: update to 2.1.1: launches fine
- [x] strawberry: update to 1.2.7 - works well, I use it on a daily basis
- [x] tellico: launches
- [x] vimpc: launches, requires mpd
- [x] ncmpcpp: launches, requires mpd
- [x] kasts: launches
- [x] juk: launches, media tags work
- [x] kf6-kfilemetadata: media tags show under properties of a media file
- [x] kodi: launches, media tags work
- [x] gst-plugins-good1: works
- [x] soundkonverter: works
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 102956 bytes --]
From b8500734da0fe47d832c1c5689823189a22fb7a7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/42] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..6df18bf4ce8e94 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 76c07778b861b0d70342c29435b8ee78caa86db9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/42] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 66b2216349615796a76556b57671478321298f2d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/42] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From b753bab97b0de8b587958b59ac673ccb3755e38a Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/42] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 70a63cddb1c9801df7aa1a5aefd69809e0879ec4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/42] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 97ebb8145791c484ec5590ad78bd174353fe66ab Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/42] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
pkg-config intltool"
From 9fc9056806145c2be929ff6e95a979527f1c72d1 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:29:48 +0100
Subject: [PATCH 07/42] thunar-media-tags-plugin: revbump for libtag_c
---
srcpkgs/thunar-media-tags-plugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 9c4d3fa442ad2e..c522f49730b716 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'thunar-media-tags-plugin'
pkgname=thunar-media-tags-plugin
version=0.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-locales-dir=/usr/share/locale"
hostmakedepends="intltool pkg-config"
From 07e52c79b12cee2c250a9a7d5167aaef8df1bff4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:32:18 +0100
Subject: [PATCH 08/42] QMPlay2: revbump for libtag
---
srcpkgs/QMPlay2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 9db48d1f8b2654..97ad3f2e6c719c 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,7 +1,7 @@
# Template file for 'QMPlay2'
pkgname=QMPlay2
version=25.01.19
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel
From 0f068daa1d1573b85271eda54407a391361100c7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:58:55 +0100
Subject: [PATCH 09/42] ardour: update to 8.12
---
.../patches/0001-Unset-HAVE_GNU_FTW.patch | 40 +++++++++++++++++++
srcpkgs/ardour/template | 9 ++++-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
diff --git a/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
new file mode 100644
index 00000000000000..7eceaffc0cc21a
--- /dev/null
+++ b/srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
@@ -0,0 +1,40 @@
+From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001
+From: Oliver Smith <ollieparanoid@postmarketos.org>
+Date: Thu, 18 Jul 2024 23:44:34 +0200
+Subject: [PATCH] Unset HAVE_GNU_FTW
+
+Don't assume we have GNU_FTW on Alpine.
+---
+ libs/tk/ydk/config.h | 2 --
+ libs/tk/ytk/config.h | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
+index d933837df2..009d3303bf 100644
+--- a/libs/tk/ydk/config.h
++++ b/libs/tk/ydk/config.h
+@@ -26,8 +26,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
+index f9991eee10..9f09e8d88a 100644
+--- a/libs/tk/ytk/config.h
++++ b/libs/tk/ytk/config.h
+@@ -23,8 +23,6 @@
+ #endif
+
+ #ifndef __APPLE__
+-/* Have GNU ftw */
+-#define HAVE_GNU_FTW 1
+ #endif
+
+ /* Define to 1 if ipc.h is available */
+--
+2.45.2
+
diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template
index a2d06acbabd057..8b25f3b6385864 100644
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@@ -1,6 +1,6 @@
# Template file for 'ardour'
pkgname=ardour
-version=8.1
+version=8.12
revision=1
build_style=waf3
configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy
@@ -23,6 +23,13 @@ CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS="-lexecinfo"
+ ;;
+esac
+
case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
i686*) configure_args+=" --dist-target=i686" ;;
From c793fbea650ebc2f2bcbc0fdd2c0585bc627fb17 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:07:50 +0100
Subject: [PATCH 10/42] clementine: revbump for libtag
---
srcpkgs/clementine/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index ed62f519456f9f..55aaeee2ce86ce 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,8 +1,8 @@
# Template file for 'clementine'
pkgname=clementine
version=1.4.1
-revision=1
-_fullver=${version}-10-gefe886e0a
+revision=2
+_fullver=${version}-35-g400085808
build_style=cmake
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON
-DFORCE_GIT_REVISION=${_fullver} -DCMAKE_CXX_STANDARD=17"
@@ -20,7 +20,14 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3.0-or-later"
homepage="https://www.clementine-player.org/"
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/clementine-${_fullver}.tar.xz"
-checksum=f751157c6e8cb760f86802344a32220a4259a2c15d0a2a9f235777f9d3c0aa1d
+checksum=6333035fd48899768132815cbb6edf3277d247e82d78b74bb505b58baeace84f
+
+case "$XBPS_TARGET_MACHINE" in
+ *-musl)
+ configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-lexecinfo'"
+ makedepends+=" libexecinfo-devel"
+ ;;
+esac
post_install() {
rm -rf $DESTDIR/builddir
From 0cafb9c80c163e8270ad053e4da0d8ddad8739ce Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:41:32 +0100
Subject: [PATCH 11/42] easytag: revbump for libtag
---
.../easytag/patches/easytag-taglib-2.patch | 324 ++++++++++++++++++
srcpkgs/easytag/template | 4 +-
2 files changed, 326 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/easytag/patches/easytag-taglib-2.patch
diff --git a/srcpkgs/easytag/patches/easytag-taglib-2.patch b/srcpkgs/easytag/patches/easytag-taglib-2.patch
new file mode 100644
index 00000000000000..c1946ab55d4f44
--- /dev/null
+++ b/srcpkgs/easytag/patches/easytag-taglib-2.patch
@@ -0,0 +1,324 @@
+From: =?utf-8?b?QmFsbMOzIEd5w7ZyZ3k=?= <ballogyor@gmail.com>
+Date: Wed, 21 Aug 2024 10:58:05 +0200
+Subject: [PATCH] Port to taglib 2
+
+Closes: https://gitlab.gnome.org/GNOME/easytag/-/issues/92
+Forwarded: https://gitlab.gnome.org/GNOME/easytag/-/merge_requests/16
+Bug-Debian: https://bugs.debian.org/1092704
+---
+ src/tags/gio_wrapper.cc | 22 +++++++++++-----------
+ src/tags/gio_wrapper.h | 12 ++++++------
+ src/tags/mp4_tag.cc | 19 +++----------------
+ 4 files changed, 21 insertions(+), 34 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8716331..8772d52 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,11 +47,11 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (TagLib::ulong len)
++GIO_InputStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ TagLib::ByteVector rv (len, 0);
+@@ -70,14 +70,14 @@ GIO_InputStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_InputStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+
+ void
+-GIO_InputStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_InputStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+ g_warning ("%s", "Trying to write to read-only file!");
+ }
+@@ -200,11 +200,11 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (TagLib::ulong len)
++GIO_IOStream::readBlock (ulong len)
+ {
+ if (error)
+ {
+- return TagLib::ByteVector::null;
++ return TagLib::ByteVector();
+ }
+
+ gsize bytes = 0;
+@@ -239,8 +239,8 @@ GIO_IOStream::writeBlock (TagLib::ByteVector const &data)
+
+ void
+ GIO_IOStream::insert (TagLib::ByteVector const &data,
+- TagLib::ulong start,
+- TagLib::ulong replace)
++ TagLib::offset_t start,
++ size_t replace)
+ {
+ if (error)
+ {
+@@ -351,9 +351,9 @@ GIO_IOStream::insert (TagLib::ByteVector const &data,
+ }
+
+ void
+-GIO_IOStream::removeBlock (TagLib::ulong start, TagLib::ulong len)
++GIO_IOStream::removeBlock (TagLib::offset_t start, size_t len)
+ {
+- if (start + len >= (TagLib::ulong)length ())
++ if (start + len >= (ulong)length ())
+ {
+ truncate (start);
+ return;
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index e49e54d..4f99b24 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,10 +33,10 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong length = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+@@ -61,10 +61,10 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (TagLib::ulong length);
++ virtual TagLib::ByteVector readBlock (ulong length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+- virtual void insert (TagLib::ByteVector const &data, TagLib::ulong start = 0, TagLib::ulong replace = 0);
+- virtual void removeBlock (TagLib::ulong start = 0, TagLib::ulong len = 0);
++ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
++ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+ virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+diff --git a/src/tags/mp4_tag.cc b/src/tags/mp4_tag.cc
+index d24695c..1728189 100644
+--- a/src/tags/mp4_tag.cc
++++ b/src/tags/mp4_tag.cc
+@@ -222,7 +222,7 @@ mp4tag_read_file_tag (GFile *file,
+ FileTag->encoded_by = g_strdup (encodedbys.front ().toCString (true));
+ }
+
+- const TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
++ const TagLib::MP4::ItemMap &extra_items = tag->itemMap ();
+
+ /* Album Artist */
+ #if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+@@ -437,25 +437,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ fields.insert ("ENCODEDBY", string);
+ }
+
+- TagLib::MP4::ItemListMap &extra_items = tag->itemListMap ();
+-
+ /* Album artist. */
+ if (!et_str_empty (FileTag->album_artist))
+ {
+ TagLib::String string (FileTag->album_artist, TagLib::String::UTF8);
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- /* No "ALBUMARTIST" support in TagLib until 1.10; use atom directly. */
+- extra_items.insert ("aART", TagLib::MP4::Item (string));
+-#else
+ fields.insert ("ALBUMARTIST", string);
+-#endif
+ }
+-#if (TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION < 10)
+- else
+- {
+- extra_items.erase ("aART");
+- }
+-#endif
+
+ /***********
+ * Picture *
+@@ -491,12 +478,12 @@ mp4tag_write_file_tag (const ET_File *ETFile,
+ TagLib::MP4::CoverArt art (f, TagLib::ByteVector((char *)data,
+ data_size));
+
+- extra_items.insert ("covr",
++ tag->setItem("covr",
+ TagLib::MP4::Item (TagLib::MP4::CoverArtList ().append (art)));
+ }
+ else
+ {
+- extra_items.erase ("covr");
++ tag->removeItem("covr");
+ }
+
+ tag->setProperties (fields);
+
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 11 Jan 2025 14:48:46 -0500
+Subject: taglib-2 further fix
+
+Further fix compatibility with taglib 2.x on 32-bit architecture.
+---
+ src/tags/gio_wrapper.cc | 20 ++++++++++----------
+ src/tags/gio_wrapper.h | 20 ++++++++++----------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/src/tags/gio_wrapper.cc b/src/tags/gio_wrapper.cc
+index 8772d52..8fdd9e7 100644
+--- a/src/tags/gio_wrapper.cc
++++ b/src/tags/gio_wrapper.cc
+@@ -47,7 +47,7 @@ GIO_InputStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_InputStream::readBlock (ulong len)
++GIO_InputStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -95,7 +95,7 @@ GIO_InputStream::isOpen () const
+ }
+
+ void
+-GIO_InputStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_InputStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -133,13 +133,13 @@ GIO_InputStream::clear ()
+ }
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_InputStream::length ()
+ {
+ if (error)
+@@ -161,7 +161,7 @@ GIO_InputStream::length ()
+ }
+
+ void
+-GIO_InputStream::truncate (long int len)
++GIO_InputStream::truncate (TagLib::offset_t len)
+ {
+ g_warning ("%s", "Trying to truncate read-only file");
+ }
+@@ -200,7 +200,7 @@ GIO_IOStream::name () const
+ }
+
+ TagLib::ByteVector
+-GIO_IOStream::readBlock (ulong len)
++GIO_IOStream::readBlock (size_t len)
+ {
+ if (error)
+ {
+@@ -400,7 +400,7 @@ GIO_IOStream::isOpen () const
+ }
+
+ void
+-GIO_IOStream::seek (long int offset, TagLib::IOStream::Position p)
++GIO_IOStream::seek (TagLib::offset_t offset, TagLib::IOStream::Position p)
+ {
+ if (error)
+ {
+@@ -434,13 +434,13 @@ GIO_IOStream::clear ()
+ g_clear_error (&error);
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::tell () const
+ {
+ return g_seekable_tell (G_SEEKABLE (stream));
+ }
+
+-long int
++TagLib::offset_t
+ GIO_IOStream::length ()
+ {
+ long rv = -1;
+@@ -464,7 +464,7 @@ GIO_IOStream::length ()
+ }
+
+ void
+-GIO_IOStream::truncate (long int len)
++GIO_IOStream::truncate (TagLib::offset_t len)
+ {
+ if (error)
+ {
+diff --git a/src/tags/gio_wrapper.h b/src/tags/gio_wrapper.h
+index 4f99b24..fc634ab 100644
+--- a/src/tags/gio_wrapper.h
++++ b/src/tags/gio_wrapper.h
+@@ -33,17 +33,17 @@ public:
+ GIO_InputStream (GFile *file_);
+ virtual ~GIO_InputStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t length = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+@@ -61,17 +61,17 @@ public:
+ GIO_IOStream (GFile *file_);
+ virtual ~GIO_IOStream ();
+ virtual TagLib::FileName name () const;
+- virtual TagLib::ByteVector readBlock (ulong length);
++ virtual TagLib::ByteVector readBlock (size_t length);
+ virtual void writeBlock (TagLib::ByteVector const &data);
+ virtual void insert (TagLib::ByteVector const &data, TagLib::offset_t start = 0, size_t replace = 0);
+ virtual void removeBlock (TagLib::offset_t start = 0, size_t len = 0);
+ virtual bool readOnly () const;
+ virtual bool isOpen () const;
+- virtual void seek (long int offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
++ virtual void seek (TagLib::offset_t offset, TagLib::IOStream::Position p = TagLib::IOStream::Beginning);
+ virtual void clear ();
+- virtual long int tell () const;
+- virtual long int length ();
+- virtual void truncate (long int length);
++ virtual TagLib::offset_t tell () const;
++ virtual TagLib::offset_t length ();
++ virtual void truncate (TagLib::offset_t length);
+
+ virtual const GError *getError() const;
+
+
diff --git a/srcpkgs/easytag/template b/srcpkgs/easytag/template
index 49d84513dc15e0..dc15d6461813f7 100644
--- a/srcpkgs/easytag/template
+++ b/srcpkgs/easytag/template
@@ -1,7 +1,7 @@
# Template file for 'easytag'
pkgname=easytag
version=2.4.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="gdk-pixbuf glib-devel intltool itstool pkg-config"
makedepends="gtk+3-devel id3lib-devel libid3tag-devel libvorbis-devel
@@ -12,5 +12,5 @@ license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/EasyTAG"
distfiles="http://download.gnome.org/sources/easytag/${version%.*}/easytag-${version}.tar.xz"
checksum=fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5
-
+make_check=no # one test fails - FAIL: tests/test-desktop-file-validate.sh
CXXFLAGS="-Wno-error=format="
From 3c5d73b86c13a2c8d06573de88331eee8cf462bd Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:42:56 +0100
Subject: [PATCH 12/42] flacon: update to 12.0.0, switch to qt6
---
srcpkgs/flacon/template | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/flacon/template b/srcpkgs/flacon/template
index e11ce5fdf88fd3..521a39aa9043b6 100644
--- a/srcpkgs/flacon/template
+++ b/srcpkgs/flacon/template
@@ -1,10 +1,11 @@
# Template file for 'flacon'
pkgname=flacon
-version=9.0.0
+version=12.0.0
revision=1
build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="qt5-tools-devel uchardet-devel taglib-devel"
+configure_args="-DUSE_QT6=ON -DUSE_QT5=OFF"
+hostmakedepends="pkg-config qt6-tools"
+makedepends="qt6-tools-devel qt6-widgets uchardet-devel taglib-devel"
depends="ffmpeg hicolor-icon-theme"
short_desc="Audio File Encoder. Splits audio tracks into separate tracks"
maintainer="travankor <travankor@tuta.io>"
@@ -12,10 +13,14 @@ license="LGPL-2.1-or-later"
homepage="https://flacon.github.io/"
changelog="https://flacon.github.io/changelog/"
distfiles="https://github.com/Flacon/flacon/archive/v${version}.tar.gz"
-checksum=a83d5fe297ceb6408b7f63c56a6be336fe1c6d06ebedcc0c84a3f7dd234140e4
+checksum=78199ff925b7cd0ffeb628d47909ca4172f8ff0d8fd8192bb537e0c012e6f4c6
if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-qmake"
+ hostmakedepends+=" qt6-base"
+ post_configure() {
+ # use host lrelease instead of target binary which breaks compilation
+ vsed -i build/build.ninja -e "s|${XBPS_CROSS_BASE}/usr/lib.*/qt6/bin/lrelease|/usr/lib/qt6/bin/lrelease|g"
+ }
fi
post_install() {
From 09264a76474cf82067faf1ec19d0687bb8e111f3 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:45:02 +0100
Subject: [PATCH 13/42] gerbera: update to 2.5.0
---
srcpkgs/gerbera/template | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 5e2da9c98da86b..7bfbfb3ef4e905 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,24 +1,20 @@
# Template file for 'gerbera'
pkgname=gerbera
-version=1.12.1
-revision=2
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
+configure_args="-DWITH_SYSTEMD=OFF -DWITH_AVCODEC=ON -DWITH_NPUPNP=ON"
hostmakedepends="pkg-config"
makedepends="duktape-devel expat-devel ffmpeg6-devel file-devel libcurl-devel
- libexif-devel libupnp-devel libuuid-devel sqlite-devel taglib-devel
- fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel"
+ libexif-devel libnpupnp-devel libuuid-devel sqlite-devel taglib-devel
+ fmt-devel spdlog pugixml-devel libebml-devel libmatroska-devel exiv2-devel"
short_desc="UPnP Media Server based on MediaTomb"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
homepage="http://gerbera.io/"
changelog="https://raw.githubusercontent.com/gerbera/gerbera/master/ChangeLog.md"
distfiles="https://github.com/gerbera/gerbera/archive/v${version}.tar.gz"
-checksum=2144a7c4a13e8b43aa0c911fbeae65f05e2c42254ddd03be5c41f5fcf103a93c
-
-# libupnp uses large file support, so users must do that, too
-CXXFLAGS="-D_FILE_OFFSET_BITS=64"
-
+checksum=e1dd2c710758fbb9f4db6f1afc461bdd1b6c55ef29147d450ab6d90624177f09
system_accounts="gerbera"
make_dirs="/var/lib/gerbera 0750 gerbera gerbera"
From db74ef1376d323355817a2356d783aa53e139aab Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 21:46:56 +0100
Subject: [PATCH 14/42] gogglesmm: revbump for libtag
---
srcpkgs/gogglesmm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 1c6ff145941334..091a804e6b2337 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,7 +1,7 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.5
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
From 84250ff754622dad231a6625794322443dc3e376 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:00:22 +0100
Subject: [PATCH 15/42] k3b: revbump for libtag
---
srcpkgs/k3b/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 5334d2159b9236..fe35d7135869c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
# Template file for 'k3b'
pkgname=k3b
version=24.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DQT_MAJOR_VERSION=6
From 094a83f4fdae2af529f9d874441a3de1facfec81 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:12:14 +0100
Subject: [PATCH 16/42] vlc: revbump for libtag
---
srcpkgs/vlc/patches/taglib-2.0.patch | 97 ++++++++++++++++++++++++++++
srcpkgs/vlc/template | 2 +-
2 files changed, 98 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch
diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch
new file mode 100644
index 00000000000000..930e55fb6dfb79
--- /dev/null
+++ b/srcpkgs/vlc/patches/taglib-2.0.patch
@@ -0,0 +1,97 @@
+Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch
+diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
+index 84b401c..a3bdac7 100644
+--- a/modules/meta_engine/taglib.cpp
++++ b/modules/meta_engine/taglib.cpp
+@@ -185,7 +185,7 @@ public:
+ ByteVector res(length, 0);
+ ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
+ if (i_read < 0)
+- return ByteVector::null;
++ return ByteVector();
+ else if ((size_t)i_read != length)
+ res.resize(i_read);
+ return res;
+@@ -216,7 +216,7 @@ public:
+
+ void seek(long offset, Position p)
+ {
+- uint64_t pos = 0;
++ offset_t pos = 0;
+ switch (p)
+ {
+ case Current:
+@@ -237,12 +237,12 @@ public:
+ return;
+ }
+
+- long tell() const
++ offset_t tell() const
+ {
+ return m_previousPos;
+ }
+
+- long length()
++ offset_t length()
+ {
+ uint64_t i_size;
+ if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS)
+@@ -256,7 +256,7 @@ public:
+
+ private:
+ stream_t* m_stream;
+- int64_t m_previousPos;
++ offset_t m_previousPos;
+ };
+ #endif /* TAGLIB_VERSION_1_11 */
+
+@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
+ static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
+ {
+ #define SET( accessor, meta ) \
+- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
++ if( !tag->accessor().isEmpty() ) \
+ vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
+ #define SETINT( accessor, meta ) \
+ if( tag->accessor() ) \
+@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ {
+ MP4::Item list;
+ #define SET( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
+ }
+ #define SET_EXTRA( keyName, metaName ) \
+- if( tag->itemListMap().contains(keyName) ) \
++ if( tag->itemMap().contains(keyName) ) \
+ { \
+- list = tag->itemListMap()[keyName]; \
++ list = tag->itemMap()[keyName]; \
+ vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
+ }
+
+@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
+ #undef SET
+ #undef SET_EXTRA
+
+- if( tag->itemListMap().contains("covr") )
++ if( tag->itemMap().contains("covr") )
+ {
+- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
++ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+- WriteMetaToId3v2( riff_wav->tag(), p_item );
++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
+ }
+ else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
+ {
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 854e8815c90a9d..8bcd63d55db21f 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.21
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 90a3d8d4c82608e3c283eacebca7b14688e2ecc9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:16:04 +0100
Subject: [PATCH 17/42] kfilemetadata5: revbump for libtag
---
srcpkgs/kfilemetadata5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 88ed174a02b8a4..03576c040ce2b5 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,7 +1,7 @@
# Template file for 'kfilemetadata5'
pkgname=kfilemetadata5
version=5.116.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
gettext kcoreaddons python3"
From c104df44bb699f76047ca048a87c9c0736cb375d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:18:42 +0100
Subject: [PATCH 18/42] kid3: revbump for libtag
---
srcpkgs/kid3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template
index 5608dee43d9be6..2effb1655eef0c 100644
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@@ -1,7 +1,7 @@
# Template file for 'kid3'
pkgname=kid3
version=3.9.6
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_WITH_QT6=ON -DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)'
-DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF)
From e258332af54c7a87da772143d277f0bb913e1567 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:32:24 +0100
Subject: [PATCH 19/42] krename: revbump for libtag
---
srcpkgs/krename/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/krename/template b/srcpkgs/krename/template
index 2c4486a763144b..2b2079d3d041f5 100644
--- a/srcpkgs/krename/template
+++ b/srcpkgs/krename/template
@@ -1,7 +1,7 @@
# Template file for 'krename'
pkgname=krename
version=5.0.2
-revision=3
+revision=4
build_style=cmake
hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
From 8c8b5db2e6421bd61bd5bf877157e85670f96c24 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 22:36:25 +0100
Subject: [PATCH 20/42] lms: revbump for libtag
---
srcpkgs/lms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template
index f79a66366a8d7a..707e2a591d1175 100644
--- a/srcpkgs/lms/template
+++ b/srcpkgs/lms/template
@@ -1,7 +1,7 @@
# Template file for 'lms'
pkgname=lms
version=3.59.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick"
hostmakedepends="pkg-config"
From cc5c3583cd9cd70f6eef97f1b2de239715472ac6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:53:26 +0100
Subject: [PATCH 21/42] mixxx: update to 2.5.0
---
srcpkgs/mixxx/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 3568315470a260..aec51f78c11fee 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,22 +1,24 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.3.3
-revision=8
+version=2.5.0
+revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
-hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake"
-makedepends="chromaprint-devel faad2-devel ffmpeg6-devel libkeyfinder-devel glu-devel
- lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
- opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
- wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
- qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
- speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
- qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
-depends="qt5-plugin-sqlite"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DENGINEPRIME=OFF"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt6-tools"
+makedepends="benchmark-devel chromaprint-devel faad2-devel ffmpeg6-devel
+ glib-devel glu-devel gperftools-devel gtest-devel lame-devel libid3tag-devel
+ libsndfile-devel libmad-devel libmodplug-devel libusb-devel opusfile-devel
+ libflac-devel libogg-devel libvorbis-devel lilv-devel lv2
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel rubberband-devel
+ taglib-devel upower-devel hidapi-devel speex-devel soundtouch-devel
+ qt6-qt5compat-devel qt6-base-devel qt6-declarative-devel
+ qt6-base-private-devel qt6-declarative-private-devel qt6-svg-devel
+ qt6-tools-devel qtkeychain-qt6-devel qt6-shadertools-devel libebur128-devel
+ gsl-devel guidelines-support-library openssl-devel libkeyfinder-devel"
+depends="qt6-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
-checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
+checksum=95ad113f1988abaa4fabc2e19027d5456a6ba9cb0f6366a386a2239030f41089
From 61b26d8935fccf04a977db35bc0677680e7a63c8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 23:59:04 +0100
Subject: [PATCH 22/42] mp3unicode: revbump for libtag
---
srcpkgs/mp3unicode/patches/taglib-2.patch | 11 +++++++++++
srcpkgs/mp3unicode/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/mp3unicode/patches/taglib-2.patch
diff --git a/srcpkgs/mp3unicode/patches/taglib-2.patch b/srcpkgs/mp3unicode/patches/taglib-2.patch
new file mode 100644
index 00000000000000..e7a4091a165e92
--- /dev/null
+++ b/srcpkgs/mp3unicode/patches/taglib-2.patch
@@ -0,0 +1,11 @@
+--- a/mp3unicode.cpp 2012-05-07 14:03:19.000000000 +0200
++++ b/mp3unicode.cpp 2025-02-25 23:57:07.907736208 +0100
+@@ -192,7 +192,7 @@
+ bool
+ heuristicIsUnicode (TagLib::String string) {
+ unsigned u0080 = 0;
+- for(TagLib::uint i = 0; i < string.size(); i++) {
++ for(unsigned int i = 0; i < string.size(); i++) {
+ if(string[i] > 255) {
+ return true;
+ }
diff --git a/srcpkgs/mp3unicode/template b/srcpkgs/mp3unicode/template
index 7c30d271da3fcf..8bee0048c9b7c5 100644
--- a/srcpkgs/mp3unicode/template
+++ b/srcpkgs/mp3unicode/template
@@ -1,7 +1,7 @@
# Template file for 'mp3unicode'
pkgname=mp3unicode
version=1.2.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="taglib-devel"
From ff4df5ed77e3a1d6452e3846644820f6feefc42f Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 00:02:33 +0100
Subject: [PATCH 23/42] musikcube: revbump for libtag
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index bddf5ad3038d9c..95641d75a5fb6f 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=3.0.4
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1"
From 6c1c95aa471d5a389fe8f27ed045d3676b0f857c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 12:59:54 +0100
Subject: [PATCH 24/42] qmmp: update to 1.7.3
---
.../qmmp/patches/projectM-config_inp.patch | 22 -------------------
srcpkgs/qmmp/template | 6 ++---
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/qmmp/patches/projectM-config_inp.patch
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
deleted file mode 100644
index f2bc53dba57e8d..00000000000000
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/plugins/Visual/projectm/projectm.pro 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectm.pro 2021-02-12 15:19:03.951750274 +0100
-@@ -22,6 +22,7 @@
- LIBS += -L/usr/lib -I/usr/include
- #projectM config path
- PROJECTM_CONFIG_FILES = /usr/share/projectM/config.inp \
-+ /usr/libexec/projectM/config.inp \
- /usr/local/share/projectM/config.inp
- for(path, PROJECTM_CONFIG_FILES) {
- exists($$path) {
-diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- a/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-04 20:09:45.000000000 +0100
-+++ b/src/plugins/Visual/projectm/projectmwidget.cpp 2021-02-12 15:22:26.833419341 +0100
-@@ -34,7 +34,7 @@
- #include "projectmwidget.h"
-
- #ifndef PROJECTM_CONFIG
--#define PROJECTM_CONFIG "/usr/share/projectM/config.inp"
-+#define PROJECTM_CONFIG "/usr/libexec/projectM/config.inp"
- #endif
-
- ProjectMWidget::ProjectMWidget(QListWidget *listWidget, QWidget *parent)
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index e96175b05eaed6..c0b1792808474c 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,7 +1,7 @@
# Template file for 'qmmp'
pkgname=qmmp
-version=1.6.1
-revision=4
+version=1.7.3
+revision=1
build_style=cmake
configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://qmmp.ylsoftware.com"
distfiles="http://qmmp.ylsoftware.com/files/qmmp/${version%.*}/qmmp-${version}.tar.bz2"
-checksum=2d8d5be8ed81dfa3b67de98b00800f7ea0fe9ac2d0f912e49265b0f4f7f5693f
+checksum=093100644c6d826170ba8bc22f8619fc4ae555ff41174ced510dd87a0a0dcbf0
qmmp-devel_package() {
short_desc+=" - development files"
From df9a87438577e4b99e32cc6e546b341e35ad2c9b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:30:55 +0100
Subject: [PATCH 25/42] quimup: update to 2.1.1
---
srcpkgs/quimup/template | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template
index edec0a09e5a29e..d687794c418efd 100644
--- a/srcpkgs/quimup/template
+++ b/srcpkgs/quimup/template
@@ -1,24 +1,24 @@
# Template file for 'quimup'
pkgname=quimup
-version=1.4.4
+version=2.1.1
revision=1
build_style=qmake
-configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtGui'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtNetwork'
- INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtWidgets'"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-makedepends="libmpdclient-devel qt5-devel taglib-devel"
-short_desc="Client for MPD written in c++ and QT5"
+configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtCore'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtGui'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtNetwork'
+ INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt6/QtWidgets'"
+hostmakedepends="pkg-config qt6-base"
+makedepends="libmpdclient-devel taglib-devel qt6-base-devel"
+short_desc="Client for MPD written in c++ and QT6"
maintainer="beefcurtains <beefcurtains@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/quimup/"
-distfiles="${SOURCEFORGE_SITE}/quimup/Quimup_${version}_source.tar.gz"
-checksum=d87ec8c57a78587bfc4d6230d55f713f7fb5bc2e642676b94dbd31e157dc83fc
+distfiles="${SOURCEFORGE_SITE}/quimup/Quimup%20${version}/Quimup-${version}.source.tar.gz"
+checksum=38efc5b3771ef4989ed47f8f8475caf2335f8e2650f0dee70d165c2eea9a3fea
do_install() {
vbin quimup
- vinstall ${FILESDIR}/quimup.desktop 644 usr/share/applications
- vinstall src/resources/mn_icon.png 644 usr/share/icons/hicolor/32x32/apps quimup.png
+ vinstall RPM_DEB_build/share/applications/Quimup.desktop 644 usr/share/applications
+ vinstall RPM_DEB_build/share/icons/hicolor/32x32/apps/quimup.png 644 usr/share/icons/hicolor/32x32/apps
}
From 03c2a6de5ad79503d14993139cd479bed50f60ae Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:40:04 +0100
Subject: [PATCH 26/42] strawberry: update to 1.2.9
---
srcpkgs/strawberry/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 528ca9054e5a9b..9d9858f14aacbf 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,6 +1,6 @@
# Template file for 'strawberry'
pkgname=strawberry
-version=1.2.4
+version=1.2.9
revision=1
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr"
@@ -8,7 +8,9 @@ hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
chromaprint-devel gst-plugins-base1-devel libcdio-devel libgpod-devel
libmtp-devel protobuf-devel pulseaudio-devel taglib-devel qt6-base-devel
- qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
+ qt6-plugin-mysql qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
+ KDSingleApplication taglib-devel libebur128-devel qt6-base-private-devel
+ rapidjson sparsehash"
depends="desktop-file-utils qt6-plugin-sqlite"
short_desc="Audio player and music collection organizer"
maintainer="Saksham <voidisnull@duck.com>"
@@ -16,4 +18,4 @@ license="GPL-3.0-or-later"
homepage="https://www.strawberrymusicplayer.org/"
changelog="https://raw.githubusercontent.com/strawberrymusicplayer/strawberry/master/Changelog"
distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz"
-checksum=de4868914c66b3b79e57216252ac44eb63cacf0ead1d0462b76725b956574827
+checksum=7099a35973d2551489ebbf6f33487169134e57fb292a4aeed07e68aa8d939e76
From 29701b430564dba16ef4306a8a97cba0bc7ecc6c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:48:02 +0100
Subject: [PATCH 27/42] tellico: revbump for libtag
---
srcpkgs/tellico/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template
index 792106c453f2ef..da06976414685c 100644
--- a/srcpkgs/tellico/template
+++ b/srcpkgs/tellico/template
@@ -1,7 +1,7 @@
# Template file for 'tellico'
pkgname=tellico
version=4.0.1
-revision=1
+revision=2
build_style=cmake
configure_args="$(vopt_bool webcam ENABLE_WEBCAM) -DKF6_HOST_TOOLING=/usr/lib/cmake"
hostmakedepends="extra-cmake-modules qt6-base qt6-tools gettext
@@ -33,6 +33,10 @@ desc_option_yaz="Support for searching z39.50 databases"
desc_option_cddb="Support for CDDB searches"
desc_option_scanner="Support for adding scanned images to a collection"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+ make_check=no # two tests fail on GH workflows: 14 - newstufftest (SEGFAULT), 40 - htmlexportertest (SEGFAULT)
+fi
+
if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" != "64$XBPS_TARGET_WORDSIZE" ]; then
broken="no qt6-webengine"
fi
From e849f1ba853e7de8a45240002494b0543c6de66d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 13:49:53 +0100
Subject: [PATCH 28/42] vimpc: revbump for libtag
---
srcpkgs/vimpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vimpc/template b/srcpkgs/vimpc/template
index 2160df03eb6afc..b7b956d1999db1 100644
--- a/srcpkgs/vimpc/template
+++ b/srcpkgs/vimpc/template
@@ -1,7 +1,7 @@
# Template file for 'vimpc'
pkgname=vimpc
version=0.09.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-boost --with-taglib"
hostmakedepends="autoconf automake pkg-config"
From e326e3fc81498ed6f511143fca8184639e7f95fc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:08:09 +0100
Subject: [PATCH 29/42] libtaginfo: remove package
last commit in 2016; unmaintained; doesn't build with taglib2
---
common/shlibs | 2 --
srcpkgs/libtaginfo-devel | 1 -
srcpkgs/libtaginfo/template | 29 -----------------------------
srcpkgs/removed-packages/template | 2 ++
4 files changed, 2 insertions(+), 32 deletions(-)
delete mode 120000 srcpkgs/libtaginfo-devel
delete mode 100644 srcpkgs/libtaginfo/template
diff --git a/common/shlibs b/common/shlibs
index 6df18bf4ce8e94..4bbebb4702336a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1232,8 +1232,6 @@ libnfs.so.14 libnfs-5.0.1_1
libzip.so.5 libzip-1.7.3_2
libluajit-5.1.so.2 LuaJIT-2.0.0_1
libOSMesa.so.8 libOSMesa-9.1_1
-libtaginfo.so.1 libtaginfo-0.1.3_1
-libtaginfo_c.so.0 libtaginfo-0.1.3_1
libaa.so.1 aalib-1.4rc4_2
libbsd.so.0 libbsd-0.4.2_1
libwiringPi.so libwiringPi-0.0.20200408_1
diff --git a/srcpkgs/libtaginfo-devel b/srcpkgs/libtaginfo-devel
deleted file mode 120000
index 59773b477a9880..00000000000000
--- a/srcpkgs/libtaginfo-devel
+++ /dev/null
@@ -1 +0,0 @@
-libtaginfo
\ No newline at end of file
diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template
deleted file mode 100644
index 39e4f2aec531cb..00000000000000
--- a/srcpkgs/libtaginfo/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libtaginfo'
-pkgname=libtaginfo
-version=0.2.1
-revision=2
-build_style=gnu-configure
-hostmakedepends="automake libtool pkg-config"
-makedepends="taglib-devel"
-short_desc="Library for reading media metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://bitbucket.org/shuerhaaken/libtaginfo"
-distfiles="https://bitbucket.org/shuerhaaken/libtaginfo/downloads/${pkgname}-${version}.tar.gz"
-checksum=9ca2f67ef5934b90e659436218c7cb0bb6aa573d14acf544493d7e969d14369f
-
-pre_configure() {
- autoreconf -fi
-}
-
-libtaginfo-devel_package() {
- depends="taglib-devel ${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
- vmove usr/lib/libtaginfo
- vmove usr/share
- }
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 83e1a512c29cc0..02a0366339088a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -458,6 +458,8 @@ replaces="
libspa-ffmpeg<=0.3.32_1
libspotify-devel<=12.1.51_2
libspotify<=12.1.51_2
+ libtaginfo<=0.2.1_2
+ libtaginfo-devel<=0.2.1_2
libtorrent-rasterbar-python<=1.2.2_1
libunique-devel<=3.0.2_11
libunique1-devel<=1.1.6_12
From 507adbf5261ef32309963a431f6f4aa2e5bc94e4 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:12:24 +0100
Subject: [PATCH 30/42] loudgain: remove package
last meaningful commit in 2019; doesn't build with taglib2
---
srcpkgs/loudgain/patches/ffmpeg5.patch | 11 -----------
srcpkgs/loudgain/patches/fix-cflags.patch | 20 --------------------
srcpkgs/loudgain/template | 17 -----------------
srcpkgs/removed-packages/template | 1 +
4 files changed, 1 insertion(+), 48 deletions(-)
delete mode 100644 srcpkgs/loudgain/patches/ffmpeg5.patch
delete mode 100644 srcpkgs/loudgain/patches/fix-cflags.patch
delete mode 100644 srcpkgs/loudgain/template
diff --git a/srcpkgs/loudgain/patches/ffmpeg5.patch b/srcpkgs/loudgain/patches/ffmpeg5.patch
deleted file mode 100644
index 16d4510ee98faa..00000000000000
--- a/srcpkgs/loudgain/patches/ffmpeg5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/scan.c 2019-09-06 11:31:19.000000000 -0400
-+++ b/src/scan.c 2023-03-23 11:15:40.867968521 -0400
-@@ -69,8 +69,6 @@
- * It is now useless
- * https://github.com/FFmpeg/FFmpeg/blob/70d25268c21cbee5f08304da95be1f647c630c15/doc/APIchanges#L86
- */
-- if (avformat_version() < AV_VERSION_INT(58,9,100))
-- av_register_all();
-
- av_log_set_callback(scan_av_log);
-
diff --git a/srcpkgs/loudgain/patches/fix-cflags.patch b/srcpkgs/loudgain/patches/fix-cflags.patch
deleted file mode 100644
index 25b2c969bef425..00000000000000
--- a/srcpkgs/loudgain/patches/fix-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: loudgain-0.6.8/CMakeLists.txt
-===================================================================
---- loudgain-0.6.8.orig/CMakeLists.txt
-+++ loudgain-0.6.8/CMakeLists.txt
-@@ -69,12 +69,12 @@ TARGET_LINK_LIBRARIES(loudgain
- )
-
- SET_TARGET_PROPERTIES(loudgain PROPERTIES
-- COMPILE_FLAGS "-Wall -pedantic -g"
-+ COMPILE_FLAGS "-Wall -pedantic"
- )
-
--SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE")
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE")
-
--SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE")
-
- INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template
deleted file mode 100644
index 8d6c6aeb772636..00000000000000
--- a/srcpkgs/loudgain/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'loudgain'
-pkgname=loudgain
-version=0.6.8
-revision=3
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="libebur128-devel taglib-devel ffmpeg6-devel"
-short_desc="ReplayGain 2.0 loudness normalizer"
-maintainer="Kartik Singh <kartik.ynwa@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/Moonbase59/loudgain"
-distfiles="https://github.com/Moonbase59/loudgain/archive/v${version}.tar.gz"
-checksum=1137c193ad941b366e87c5d84ccc95a7aa8571affc060db0bd1cf72c489aeaee
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 02a0366339088a..c58ee66bb5ee18 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -493,6 +493,7 @@ replaces="
llvm7<=7.0.1_10
llvm8<=8.0.1_5
llvm9<=9.0.1_8
+ loudgain<=0.6.8_3
lprng<=3.8.C_1
lrzip-devel<=0.641_1
ls++-git<=20140919_3
From 0aca8ac2cbb2e100df1915b72530c1f44ff09455 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:23:12 +0100
Subject: [PATCH 31/42] ncmpcpp: update to 0.10.1, use taglib2
---
srcpkgs/ncmpcpp/patches/socket-inode.patch | 16 ----------------
srcpkgs/ncmpcpp/template | 20 ++++++++++----------
2 files changed, 10 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/ncmpcpp/patches/socket-inode.patch
diff --git a/srcpkgs/ncmpcpp/patches/socket-inode.patch b/srcpkgs/ncmpcpp/patches/socket-inode.patch
deleted file mode 100644
index 6bf92146ea0914..00000000000000
--- a/srcpkgs/ncmpcpp/patches/socket-inode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Support sockets without a socket inode
-# https://github.com/ncmpcpp/ncmpcpp/commit/40e4f98ee896ea10967eb1c4323bb718331eabea
-diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp
-index ccdee31d..9a92e5df 100644
---- a/src/mpdpp.cpp
-+++ b/src/mpdpp.cpp
-@@ -147,7 +147,7 @@ unsigned Connection::Version() const
- void Connection::SetHostname(const std::string &host)
- {
- size_t at = host.find("@");
-- if (at != std::string::npos)
-+ if (at != 0 && at != std::string::npos)
- {
- m_password = host.substr(0, at);
- m_host = host.substr(at+1);
-
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 75ce5f6f31f559..b0fba7f09df2a8 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,25 +1,25 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
-version=0.9.2
-revision=11
+version=0.10.1
+revision=1
build_style=gnu-configure
-configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
- --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
-hostmakedepends="pkg-config"
-makedepends="boost-devel fftw-devel icu-devel libcurl-devel libmpdclient-devel
- readline-devel taglib-devel"
+configure_args=" --enable-clock --enable-outputs --enable-unicode
+ --enable-visualizer --with-curl --with-taglib --with-fftw"
+hostmakedepends="automake libtool pkg-config"
+makedepends="boost-devel fftw-devel icu-devel libcurl-devel libltdl-devel
+ libmpdclient-devel readline-devel taglib-devel"
short_desc="Ncurses mpd client inspired by ncmpc"
maintainer="cinerea0 <cinerea0@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://rybczak.net/ncmpcpp"
-distfiles="${homepage}/stable/ncmpcpp-${version}.tar.bz2"
-checksum=faabf6157c8cb1b24a059af276e162fa9f9a3b9cd3810c43b9128860c9383a1b
+distfiles="https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${version}.tar.gz"
+checksum=ddc89da86595d272282ae8726cc7913867b9517eec6e765e66e6da860b58e2f9
# Required by waddwstr() with ncurses on musl
CXXFLAGS="-D_XOPEN_SOURCE=600"
pre_configure() {
- vsed -e '/^docdir/d' -i {,doc/}Makefile.in
+ autoreconf -fiv
}
post_install() {
From 4b372d7e071c5f77ac66a557dc11c90a8d30547b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 14:28:09 +0100
Subject: [PATCH 32/42] python3-pytaglib: update to 3.0.0
---
srcpkgs/python3-pytaglib/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template
index f2e95a4f3bd3c2..cd77c36437c327 100644
--- a/srcpkgs/python3-pytaglib/template
+++ b/srcpkgs/python3-pytaglib/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytaglib'
pkgname=python3-pytaglib
-version=1.4.6
-revision=6
+version=3.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel taglib-devel"
@@ -11,10 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/supermihi/pytaglib"
distfiles="https://github.com/supermihi/pytaglib/archive/v${version}.tar.gz"
-checksum=360b12d5b4c948cebf75acf86fac6b33a3f044eab6fcfe8949a1cd0f9c22bd25
-
-post_extract() {
- # Make sure Cython generates an up-to-date source file
- rm src/taglib.cpp
- cythonize src/taglib.pyx
-}
+checksum=ed3ea28ed5711ff3262d40eca1f2566607b4bb81de7e70c24956d07c995f1833
From 409f525e7fd4490af3b9b551a0dcee5d8cc285fa Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Feb 2025 15:09:25 +0100
Subject: [PATCH 33/42] taglib-extras: patch for use with taglib2
---
srcpkgs/taglib-extras/patches/taglib2.patch | 319 ++++++++++++++++++++
srcpkgs/taglib-extras/template | 7 +-
2 files changed, 322 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/taglib-extras/patches/taglib2.patch
diff --git a/srcpkgs/taglib-extras/patches/taglib2.patch b/srcpkgs/taglib-extras/patches/taglib2.patch
new file mode 100644
index 00000000000000..956009c6e12bad
--- /dev/null
+++ b/srcpkgs/taglib-extras/patches/taglib2.patch
@@ -0,0 +1,319 @@
+diff -U 3 -r a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+--- a/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
++++ b/cmake/modules/FindTaglib.cmake 2024-03-18 20:02:47.451289583 +0100
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT TAGLIB_MIN_VERSION)
+- set(TAGLIB_MIN_VERSION "1.4")
++ set(TAGLIB_MIN_VERSION "2.0")
+ endif(NOT TAGLIB_MIN_VERSION)
+
+ if(NOT WIN32)
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+diff -U 3 -r a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-09-17 21:31:50.000000000 +0200
++++ b/CMakeLists.txt 2024-03-18 20:05:05.486108470 +0100
+@@ -14,7 +14,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX)
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common -std=c++11")
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ if(MSVC)
+@@ -43,7 +43,7 @@
+ set(TAGLIB_LIBRARIES tag)
+ else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ # or separately ?
+- set(TAGLIB_MIN_VERSION "1.6")
++ set(TAGLIB_MIN_VERSION "2.0")
+ find_package(Taglib REQUIRED)
+ endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+
+diff -U 3 -r a/taglib-extras/audible/audibletag.cpp b/taglib-extras/audible/audibletag.cpp
+--- a/taglib-extras/audible/audibletag.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.cpp 2024-03-18 19:33:40.553079218 +0100
+@@ -40,11 +40,11 @@
+ using namespace TagLibExtras;
+
+ Audible::Tag::Tag() {
+- m_title = TagLib::String::null;
+- m_artist = TagLib::String::null;
+- m_album = TagLib::String::null;
+- m_comment = TagLib::String::null;
+- m_genre = TagLib::String::null;
++ m_title = TagLib::String();
++ m_artist = TagLib::String();
++ m_album = TagLib::String();
++ m_comment = TagLib::String();
++ m_genre = TagLib::String();
+ m_year = 0;
+ m_track = 0;
+ m_userID = 0;
+@@ -55,11 +55,11 @@
+ }
+
+ bool Audible::Tag::isEmpty() const {
+- return m_title == TagLib::String::null &&
+- m_artist == TagLib::String::null &&
+- m_album == TagLib::String::null &&
+- m_comment == TagLib::String::null &&
+- m_genre == TagLib::String::null &&
++ return m_title == TagLib::String() &&
++ m_artist == TagLib::String() &&
++ m_album == TagLib::String() &&
++ m_comment == TagLib::String() &&
++ m_genre == TagLib::String() &&
+ m_year == 0 &&
+ m_track == 0 &&
+ m_userID == 0;
+@@ -114,7 +114,7 @@
+ }
+ else if(!strcmp(name, "description"))
+ {
+- if( m_comment.isNull() )
++ if( m_comment.isEmpty() )
+ m_comment = TagLib::String(value, TagLib::String::Latin1);
+ }
+ else if(!strcmp(name, "pubdate"))
+diff -U 3 -r a/taglib-extras/audible/audibletag.h b/taglib-extras/audible/audibletag.h
+--- a/taglib-extras/audible/audibletag.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/audible/audibletag.h 2024-03-18 19:31:45.715118382 +0100
+@@ -52,30 +52,30 @@
+
+ /*!
+ * Returns the track name; if no track name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String title() const { return m_title; }
+
+ /*!
+ * Returns the artist name; if no artist name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String artist() const { return m_artist; }
+
+ /*!
+ * Returns the album name; if no album name is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String album() const { return m_album; }
+
+ /*!
+ * Returns the track comment; if no comment is present in the tag
+- * TagLib::String::null will be returned.
++ * TagLib::String() will be returned.
+ */
+ virtual TagLib::String comment() const { return m_comment; }
+
+ /*!
+- * Returns the genre name; if no genre is present in the tag TagLib::String::null
++ * Returns the genre name; if no genre is present in the tag TagLib::String()
+ * will be returned.
+ */
+ virtual TagLib::String genre() const { return m_genre; }
+@@ -83,45 +83,45 @@
+ /*!
+ * Returns the year; if there is no year set, this will return 0.
+ */
+- virtual TagLib::uint year() const { return m_year; }
++ virtual unsigned int year() const { return m_year; }
+
+ /*!
+ * Returns the track number; if there is no track number set, this will
+ * return 0.
+ */
+- virtual TagLib::uint track() const { return m_track; }
++ virtual unsigned int track() const { return m_track; }
+
+ /*!
+ * Returns the user id for this file.
+ */
+- virtual TagLib::uint userID() const { return m_userID; }
++ virtual unsigned int userID() const { return m_userID; }
+
+ /*!
+- * Sets the title to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the title to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setTitle(const TagLib::String &s) { m_title = s; }
+
+ /*!
+- * Sets the artist to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the artist to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setArtist(const TagLib::String &s) { m_artist = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setAlbum(const TagLib::String &s) { m_album = s; }
+
+ /*!
+- * Sets the album to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the album to \a s. If \a s is TagLib::String() then this value will be
+ * cleared.
+ */
+ virtual void setComment(const TagLib::String &s) { m_comment = s; }
+
+ /*!
+- * Sets the genre to \a s. If \a s is TagLib::String::null then this value will be
++ * Sets the genre to \a s. If \a s is TagLib::String() then this value will be
+ * cleared. For tag formats that use a fixed set of genres, the appropriate
+ * value will be selected based on a string comparison. A list of available
+ * genres for those formats should be available in that type's
+@@ -132,12 +132,12 @@
+ /*!
+ * Sets the year to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setYear(TagLib::uint i) { m_year = i; }
++ virtual void setYear(unsigned int i) { m_year = i; }
+
+ /*!
+ * Sets the track to \a i. If \a s is 0 then this value will be cleared.
+ */
+- virtual void setTrack(TagLib::uint i) { m_track = i; }
++ virtual void setTrack(unsigned int i) { m_track = i; }
+
+ /*!
+ * Returns true if the tag does not contain any data. This should be
+@@ -159,7 +159,7 @@
+ */
+ static void duplicate(const Tag *source, Tag *target, bool overwrite = true);
+
+- virtual void setUserID(TagLib::uint id) { m_userID = id; }
++ virtual void setUserID(unsigned int id) { m_userID = id; }
+
+ int getTagsEndOffset();
+
+@@ -171,9 +171,9 @@
+ TagLib::String m_album;
+ TagLib::String m_comment;
+ TagLib::String m_genre;
+- TagLib::uint m_year;
+- TagLib::uint m_track;
+- TagLib::uint m_userID;
++ unsigned int m_year;
++ unsigned int m_track;
++ unsigned int m_userID;
+ bool readTag( FILE *fp, char **name, char **value);
+ int m_tagsEndOffset;
+ };
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.cpp b/taglib-extras/rmff/realmediafile.cpp
+--- a/taglib-extras/rmff/realmediafile.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.cpp 2024-03-18 19:25:30.819973309 +0100
+@@ -78,12 +78,12 @@
+ return m_rmff->genre();
+ }
+
+-TagLib::uint RealMedia::Tag::year() const
++unsigned int RealMedia::Tag::year() const
+ {
+ return m_rmff->year();
+ }
+
+-TagLib::uint RealMedia::Tag::track() const
++unsigned int RealMedia::Tag::track() const
+ {
+ return m_rmff->track();
+ }
+@@ -113,12 +113,12 @@
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setYear( TagLib::uint )
++void RealMedia::Tag::setYear( unsigned int )
+ {
+ // TODO: write support
+ }
+
+-void RealMedia::Tag::setTrack( TagLib::uint )
++void RealMedia::Tag::setTrack( unsigned int )
+ {
+ // TODO: write support
+ }
+diff -U 3 -r a/taglib-extras/rmff/realmediafile.h b/taglib-extras/rmff/realmediafile.h
+--- a/taglib-extras/rmff/realmediafile.h 2009-09-21 16:34:45.000000000 +0200
++++ b/taglib-extras/rmff/realmediafile.h 2024-03-18 19:25:44.642920743 +0100
+@@ -54,15 +54,15 @@
+ virtual TagLib::String album () const;
+ virtual TagLib::String comment () const;
+ virtual TagLib::String genre () const;
+- virtual TagLib::uint year () const;
+- virtual TagLib::uint track () const;
++ virtual unsigned int year () const;
++ virtual unsigned int track () const;
+ virtual void setTitle (const TagLib::String &s);
+ virtual void setArtist (const TagLib::String &s);
+ virtual void setAlbum (const TagLib::String &s);
+ virtual void setComment (const TagLib::String &s);
+ virtual void setGenre (const TagLib::String &s);
+- virtual void setYear (TagLib::uint i);
+- virtual void setTrack (TagLib::uint i);
++ virtual void setYear (unsigned int i);
++ virtual void setTrack (unsigned int i);
+
+ bool isEmpty() const;
+ void duplicate(const Tag *source, Tag *target, bool overwrite);
+diff -U 3 -r a/taglib-extras/rmff/rmff.cpp b/taglib-extras/rmff/rmff.cpp
+--- a/taglib-extras/rmff/rmff.cpp 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.cpp 2024-03-18 19:25:59.039184503 +0100
+@@ -98,12 +98,12 @@
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->genre() : "";
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::year() const
++unsigned int RealMedia::RealMediaFF::year() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->year() : 0;
+ }
+
+-TagLib::uint RealMedia::RealMediaFF::track() const
++unsigned int RealMedia::RealMediaFF::track() const
+ {
+ return !m_err && m_id3v1tag ? m_id3v1tag->tag()->track() : 0;
+ }
+diff -U 3 -r a/taglib-extras/rmff/rmff.h b/taglib-extras/rmff/rmff.h
+--- a/taglib-extras/rmff/rmff.h 2009-09-17 17:38:07.000000000 +0200
++++ b/taglib-extras/rmff/rmff.h 2024-03-18 19:26:08.022265920 +0100
+@@ -290,8 +290,8 @@
+ TagLib::String album () const;
+ TagLib::String comment () const;
+ TagLib::String genre () const;
+- TagLib::uint year () const;
+- TagLib::uint track () const;
++ unsigned int year () const;
++ unsigned int track () const;
+ // TODO write support
+ //void setTitle (const String &s);
+ //void setArtist (const String &s);
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index 4157777e18a4c6..9e5631ae902bae 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -1,16 +1,16 @@
# Template file for 'taglib-extras'
pkgname=taglib-extras
version=1.0.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
hostmakedepends="pkg-config taglib-devel"
makedepends="zlib-devel taglib-devel"
short_desc="Additional taglib plugins for KDE"
maintainer="LockeAnarchist <emanuel@openmailbox.org>"
+license="LGPL-2.1-only OR MPL-1.1"
homepage="http://developer.kde.org/~wheeler/taglib.html"
-license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
+distfiles="$KDE_SITE/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
pre_configure() {
@@ -28,4 +28,3 @@ taglib-extras-devel_package() {
vmove "usr/lib/*.so"
}
}
-
From 9ddb8f7f92e091cf13bfa53efedc96481287375c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:05 +0100
Subject: [PATCH 34/42] kio-extras: revbump for libtag
---
srcpkgs/kio-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index b1a969533063db..874d9b7d065f31 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
# Template file for 'kio-extras'
pkgname=kio-extras
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From 4d95ea1e377891ad01d8ee497f521a1229c8df18 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:09:50 +0100
Subject: [PATCH 35/42] kasts: revbump for libtag
---
srcpkgs/kasts/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template
index 6343f77a46ef7d..86bb20bbfb8ac5 100644
--- a/srcpkgs/kasts/template
+++ b/srcpkgs/kasts/template
@@ -1,7 +1,7 @@
# Template file for 'kasts'
pkgname=kasts
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
From 1b1bfdbea4f6662f919a75bdb61b20d826deb19c Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 10 Mar 2025 10:10:37 +0100
Subject: [PATCH 36/42] juk: revbump for libtag
---
srcpkgs/juk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index c530cda482d398..95b90486e4664d 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,7 +1,7 @@
# Template file for 'juk'
pkgname=juk
version=24.12.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake
-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
From b6aecd45f4ae4d7de6693d53bc56e7d54d7a4caf Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 17 Mar 2025 18:09:33 +0100
Subject: [PATCH 37/42] kf6-kfilemetadata: revbump for libtag
---
srcpkgs/kf6-kfilemetadata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kf6-kfilemetadata/template b/srcpkgs/kf6-kfilemetadata/template
index f6db666fd3c8ba..6d7818aec563ef 100644
--- a/srcpkgs/kf6-kfilemetadata/template
+++ b/srcpkgs/kf6-kfilemetadata/template
@@ -1,7 +1,7 @@
# Template file for 'kf6-kfilemetadata'
pkgname=kf6-kfilemetadata
version=6.12.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins"
hostmakedepends="extra-cmake-modules qt6-tools qt6-base
From d18f9df03855e2beb9163046d8177688587826b9 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 19 Mar 2025 14:47:49 +0100
Subject: [PATCH 38/42] kodi: update to 21.2
---
srcpkgs/kodi/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 5985cafb6f3d56..56c167e3e9db48 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
-version=21.1
-revision=3
+version=21.2
+revision=1
_codename="Omega"
_crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
_dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2"
@@ -24,7 +24,7 @@ configure_args="-DWITH_FFMPEG=/usr -DENABLE_LDGOLD=OFF -DAPP_RENDER_SYSTEM=gl -D
-Dlibdvdread_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libdvdread-${_dvdread_ver}.tar.gz
-DUDFREAD_URL=${XBPS_SRCDISTDIR}/${pkgname}-${version}/libudfread-${_udfread_ver}.tar.gz"
make_build_target="all"
-hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel
+hostmakedepends="automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel python3-packaging-bootstrap
gettext-devel libltdl-devel curl flatbuffers swig openjdk11 which wayland-scanner++ cross-aarch64-linux-gnu cross-aarch64-linux-gnu-libc"
makedepends="eudev-libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
@@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz
https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz
https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz"
-checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef
+checksum="da3a5df663684664b9383b65f1c06568222629d935084a59e4e641fcdcb6c383
6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4
f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e
719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62
@@ -138,11 +138,6 @@ pre_configure() {
fi
}
-post_install() {
- mkdir -p "${DESTDIR}/${py3_sitelib}"
- mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}"
-}
-
do_check() {
./build/kodi-test --gtest_filter="${_gtest_filter}"
}
From 6d656ae235df12f309c4d72b147a3efabebf2f40 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 26 Mar 2025 14:15:46 +0100
Subject: [PATCH 39/42] gst-plugins-good1: revbump for libtag
---
srcpkgs/gst-plugins-good1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 34024aff716797..dadf10f47925fa 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-good1'
pkgname=gst-plugins-good1
version=1.24.11
-revision=1
+revision=2
build_style=meson
configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled
$(vopt_feature gtk3 gtk3)"
From 52f1d359a35bfa8fc5830e51faa3c2da99af59cc Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Sun, 6 Apr 2025 16:50:13 +0200
Subject: [PATCH 40/42] id3ted: remove package
last commit in 2017; archived; doesn't build with taglib2
---
srcpkgs/id3ted/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/id3ted/template
diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template
deleted file mode 100644
index b993e5a37137da..00000000000000
--- a/srcpkgs/id3ted/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'id3ted'
-pkgname=id3ted
-version=1.0
-revision=2
-build_style=gnu-makefile
-makedepends="file-devel taglib-devel"
-short_desc="Command line id3 tag editor"
-maintainer="Piotr Wójcik <chocimier@tlen.pl>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/muennich/id3ted"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=b661514637278b00930cc13ef22f46530baadcf9f3f4ee4b7cb210b0d46b18f1
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c58ee66bb5ee18..c4de45c97be7c2 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -318,6 +318,7 @@ replaces="
icecat<=78.6.1_1
icu4lua-devel<=0.2B_14
icu4lua<=0.2B_14
+ id3ted<=1.0_2
ilmbase-devel<=2.4.2_2
ilmbase<=2.4.2_2
ioquake3-rpi<=20130506_2
From 03b6f9ee041fc6867e184a24a9e70a31a0b53d11 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Mon, 7 Apr 2025 15:48:03 +0200
Subject: [PATCH 41/42] soundkonverter: patch for taglib2
---
srcpkgs/soundkonverter/patches/taglib2.diff | 259 ++++++++++++++++++++
srcpkgs/soundkonverter/template | 2 +-
2 files changed, 260 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/soundkonverter/patches/taglib2.diff
diff --git a/srcpkgs/soundkonverter/patches/taglib2.diff b/srcpkgs/soundkonverter/patches/taglib2.diff
new file mode 100644
index 00000000000000..6e24af2ec99250
--- /dev/null
+++ b/srcpkgs/soundkonverter/patches/taglib2.diff
@@ -0,0 +1,259 @@
+diff --git a/src/metadata/tagengine.cpp b/src/metadata/tagengine.cpp
+index 4056d676..0aa48b26 100644
+--- a/src/metadata/tagengine.cpp
++++ b/src/metadata/tagengine.cpp
+@@ -367,8 +367,8 @@ TagData* TagEngine::readTags( const KUrl& fileName )
+
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "aART" )
+ {
+@@ -680,7 +680,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -688,7 +688,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -698,7 +698,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -711,7 +711,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -721,7 +721,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -734,7 +734,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -742,7 +742,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -755,7 +755,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -763,7 +763,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -773,7 +773,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -786,7 +786,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -796,7 +796,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -809,7 +809,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -817,7 +817,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -830,7 +830,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->albumArtist.isEmpty() )
+ {
+ if( tag->contains("ALBUMARTIST") )
+- tag->removeField("ALBUMARTIST");
++ tag->removeFields("ALBUMARTIST");
+
+ tag->addField( "ALBUMARTIST", TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -838,7 +838,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->composer.isEmpty() )
+ {
+ if( tag->contains("COMPOSER") )
+- tag->removeField("COMPOSER");
++ tag->removeFields("COMPOSER");
+
+ tag->addField( "COMPOSER", TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -848,7 +848,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentTrackTotalTag == "TRACKNUMBER" )
+ {
+ if( tag->contains("TRACKNUMBER") )
+- tag->removeField("TRACKNUMBER");
++ tag->removeFields("TRACKNUMBER");
+
+ tag->addField( "TRACKNUMBER", TagLib::String(track.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -861,7 +861,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( tagData->disc > 0 )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(QString::number(tagData->disc).toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -871,7 +871,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( config->data.general.preferredVorbisCommentDiscTotalTag == "DISCNUMBER" )
+ {
+ if( tag->contains("DISCNUMBER") )
+- tag->removeField("DISCNUMBER");
++ tag->removeFields("DISCNUMBER");
+
+ tag->addField( "DISCNUMBER", TagLib::String(disc.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -884,7 +884,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_TRACKID") )
+- tag->removeField("MUSICBRAINZ_TRACKID");
++ tag->removeFields("MUSICBRAINZ_TRACKID");
+
+ tag->addField( "MUSICBRAINZ_TRACKID", TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -892,7 +892,7 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+ {
+ if( tag->contains("MUSICBRAINZ_ALBUMID") )
+- tag->removeField("MUSICBRAINZ_ALBUMID");
++ tag->removeFields("MUSICBRAINZ_ALBUMID");
+
+ tag->addField( "MUSICBRAINZ_ALBUMID", TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8), true );
+ }
+@@ -903,27 +903,27 @@ bool TagEngine::writeTags( const KUrl& fileName, TagData *tagData )
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+ if( !tagData->albumArtist.isEmpty() )
+- tag->itemListMap()["aART"] = TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("aART", TagLib::StringList(TagLib::String(tagData->albumArtist.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->composer.isEmpty() )
+- tag->itemListMap()["\xA9wrt"] = TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("\xA9wrt", TagLib::StringList(TagLib::String(tagData->composer.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( tagData->trackTotal > 0 )
+- tag->itemListMap()["trkn"] = TagLib::MP4::Item( tagData->track, tagData->trackTotal );
++ tag->setItem("trkn", TagLib::MP4::Item( tagData->track, tagData->trackTotal ));
+
+ if( tagData->disc > 0 )
+ {
+ if( tagData->discTotal > 0 )
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc, tagData->discTotal );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc, tagData->discTotal ));
+ else
+- tag->itemListMap()["disk"] = TagLib::MP4::Item( tagData->disc );
++ tag->setItem("disk", TagLib::MP4::Item( tagData->disc ));
+ }
+
+ if( !tagData->musicBrainzTrackId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Track Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Track Id", TagLib::StringList(TagLib::String(tagData->musicBrainzTrackId.toUtf8().data(), TagLib::String::UTF8)));
+
+ if( !tagData->musicBrainzReleaseId.isEmpty() )
+- tag->itemListMap()["----:com.apple.iTunes:MusicBrainz Album Id"] = TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8));
++ tag->setItem("----:com.apple.iTunes:MusicBrainz Album Id", TagLib::StringList(TagLib::String(tagData->musicBrainzReleaseId.toUtf8().data(), TagLib::String::UTF8)));
+ }
+ }
+ else if( TagLib::ASF::File *file = dynamic_cast<TagLib::ASF::File*>(fileref.file()) )
+@@ -1136,8 +1136,8 @@ QList<CoverData*> TagEngine::readCovers( const KUrl& fileName )
+ {
+ if( TagLib::MP4::Tag *tag = file->tag() )
+ {
+- TagLib::MP4::ItemListMap map = tag->itemListMap();
+- for( TagLib::MP4::ItemListMap::ConstIterator it = map.begin(); it != map.end(); ++it )
++ TagLib::MP4::ItemMap map = tag->itemMap();
++ for( TagLib::MP4::ItemMap::ConstIterator it = map.begin(); it != map.end(); ++it )
+ {
+ if( it->first == "covr" )
+ {
+@@ -1290,7 +1290,7 @@ bool TagEngine::writeCovers( const KUrl& fileName, QList<CoverData*> covers )
+
+ coversList.append( TagLib::MP4::CoverArt( format, TagLib::ByteVector( cover->data.data(), cover->data.size() ) ) );
+ }
+- tag->itemListMap()["covr"] = TagLib::MP4::Item( coversList );
++ tag->setItem("covr", TagLib::MP4::Item( coversList ));
+ }
+
+ return fileref.save();
diff --git a/srcpkgs/soundkonverter/template b/srcpkgs/soundkonverter/template
index e11cd96426472b..f31ba5a0c158a0 100644
--- a/srcpkgs/soundkonverter/template
+++ b/srcpkgs/soundkonverter/template
@@ -1,7 +1,7 @@
# Template file for 'soundkonverter'
pkgname=soundkonverter
version=3.0.1
-revision=2
+revision=3
build_wrksrc=src
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-ltag"
From 80a4e5fbe8d88c48973fd5cf9bfed7491d84fa32 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Wed, 16 Apr 2025 23:28:20 +0200
Subject: [PATCH 42/42] rapidjson: gcc14 fix
---
.../remove_non-compiling_assignment_operator.patch | 11 +++++++++++
srcpkgs/rapidjson/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/rapidjson/patches/remove_non-compiling_assignment_operator.patch
diff --git a/srcpkgs/rapidjson/patches/remove_non-compiling_assignment_operator.patch b/srcpkgs/rapidjson/patches/remove_non-compiling_assignment_operator.patch
new file mode 100644
index 00000000000000..3eb6cee11d49b4
--- /dev/null
+++ b/srcpkgs/rapidjson/patches/remove_non-compiling_assignment_operator.patch
@@ -0,0 +1,11 @@
+--- a/include/rapidjson/document.h 2016-08-25 09:59:05.000000000 +0200
++++ b/include/rapidjson/document.h 2025-04-16 23:08:45.736049579 +0200
+@@ -316,8 +316,6 @@
+
+ GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
+
+- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
+-
+ //! implicit conversion to plain CharType pointer
+ operator const Ch *() const { return s; }
+
diff --git a/srcpkgs/rapidjson/template b/srcpkgs/rapidjson/template
index 2b47472c94f350..079a3bd6c5f04e 100644
--- a/srcpkgs/rapidjson/template
+++ b/srcpkgs/rapidjson/template
@@ -1,7 +1,7 @@
# Template file for 'rapidjson'
pkgname=rapidjson
version=1.1.0
-revision=5
+revision=6
build_style=cmake
short_desc="Fast JSON parser/generator for C++ with both SAX/DOM style API"
maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
^ permalink raw reply related [flat|nested] 97+ messages in thread
* Re: [PR PATCH] [Updated] taglib: update to 2.0.2
2025-02-25 21:48 [PR PATCH] [WIP] taglib: update to 2.0.2 slymattz
` (62 preceding siblings ...)
2025-04-16 21:29 ` slymattz
@ 2025-04-22 8:41 ` slymattz
2025-04-22 14:03 ` sgn
` (31 subsequent siblings)
95 siblings, 0 replies; 97+ messages in thread
From: slymattz @ 2025-04-22 8:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 6131 bytes --]
There is an updated pull request by slymattz against master on the void-packages repository
https://github.com/slymattz/void-packages strawberry
https://github.com/void-linux/void-packages/pull/54493
taglib: update to 2.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Motivation for upgrading taglib
[https://taglib.org/older.html](https://taglib.org/older.html):
> New major version, binary incompatible, but mostly source-compatible with the latest 1.x release if no deprecated features are used. Simple applications should build without changes, more complex applications (e.g. extending classes of TagLib) will have to be adapted.
I believe more complex applications will soon/already do require taglib2. Other distros typically have both packages: taglib1 and taglib. For now, a little patching is needed but I bet future releases of "more complex applications" will use taglib2 by default as it's been around for ca. 1.5 years. Taglib1 no longer receives updates and it would be needed for just a few apps (see removed apps below), so I'm not sure if taglib1 would make sense in Void, especially because of alternative packages available in the repo which serve the purpose.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture: x86_64-glibc
- I also built all of the packages for x86_64-musl
EDIT 3/10/25: resolved base conflicts
EDIT 3/19/25: resolved a base conflict (updated kodi to 21.2 as 21.1 wouldn't build for i686).
EDIT 3/26/25: resolved a gst-plugins-good1 conflict
EDIT 4/6/25: resolved a base conflict with removed-packages and added the `-DWITH_NPUPNP=ON` flag to gerbera
EDIT: 4/7/25: applied a patch to soundkonverter for compatibility with taglib2
EDIT: 4/16/25: flacon updated to 12.0.0 and switched to qt6; strawberry updated to 1.2.9; rapidjson - fixed build with gcc14 (w/out this fix strawberry wouldn't compile against rapidjson)
EDIT: 4/22/25: juk, kasts and kio-extras conflicts to be resolved and rapidjson fix dropped (already merged). strawberry updated to 1.2.10
#### About removed packages:
1. loudgain: soundkonverter is said to do ReplayGain calculations. Alternatively, loudgain could be replaced with rsgain (not packaged in Void at this time.) This works:
```
# Template file for 'rsgain'
pkgname=rsgain
version=3.6
revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="ffmpeg-devel fmt-devel taglib-devel libebur128-devel inih-devel"
short_desc="Simple, but powerful ReplayGain 2.0 tagging utility"
maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/complexlogic/rsgain"
distfiles="https://github.com/complexlogic/rsgain/archive/refs/tags/v${version}.tar.gz"
checksum=26f7acd1ba0851929dc756c93b3b1a6d66d7f2f36b31f744c8181f14d7b5c8a7
post_install() {
vlicense LICENSE
vlicense LICENSE-CRCpp
}
```
2. id3ted: there are plenty of alternatives, be it GUI-based or CLI. In the repo there's kid3, picard or puddletag, for instance.
3. libtaginfo: there are alternatives like python3-mutagen or ffmpeg etc.
I want to ping maintainers to make them aware of this PR and if they wish so, they can test their packages:
ario, easytag - @leahneukirchen
parole - @sgn
pragha - @VargMon
QMPlay2 - @abenson
ardour - @benalb
clementine - @thypon
flacon, soundkonverter - @travankor
gerbera - @crater2150
juk, kf6-kfilemetadata, kasts, kfilemetadata5, tellico - @Johnnynator
k3b - @Gottox
vlc - @Hoshpak (also pinging @zlice)
kid3 - @SolitudeSF
lms - @Danoloan10
mixxx - @prez
mp3unicode - @egorenar
quimup - @beefcurtains
strawberry - @voidisnull [**strawberry requires taglib>=2.0 now or else it falls back to pkg-config**](https://github.com/strawberrymusicplayer/strawberry/blob/d9f68ab9443154ca194bfa73968806dad9828c5e/CMakeLists.txt#L201)
vimpc - @Nicop06
ncmpcpp - @cinerea0
An additional ping goes to @Rooyca who started working on PR #51718 but seems to have abandoned it 4 months ago.
#### Testing individual packages:
- [x] ario
- [x] moc: mocp launches, media tags work
- [x] parole: launches, media tags work
- [x] pragha: launches, media tags work
- [x] thunar-media-tags-plugin: editing tags in thunar works
- [x] QMPlay2: launches, media tags work
- [x] ardour: launches, allows for the editing of metadata
- [x] clementine: launches, media tags work
- [x] easytag: launches, media tags work
- [x] flacon: launches, media tags work
- [x] gerbera: update to 2.5.0 - works well, I use it on a daily basis
- [x] gogglesmm: launches, media tags work
- [x] k3b: launches and works fine
- [x] vlc: launches, media tags work
- [x] kfilemetadata5: I guess it works. I'm not sure how to test it.
- [x] kid3: launches, media tags work
- [x] krename: launches, media tags work
- [x] lms: works
- [x] mixxx: update to 2.5.0: launches, media tags work
- [x] mp3unicode: launches
- [x] musikcube: launches, media tags work
- [x] qmmp: update to 1.7.3: launches, media tags work
- [x] quimup: update to 2.1.1: launches fine
- [x] strawberry: update to 1.2.7 - works well, I use it on a daily basis
- [x] tellico: launches
- [x] vimpc: launches, requires mpd
- [x] ncmpcpp: launches, requires mpd
- [x] kasts: launches
- [x] juk: launches, media tags work
- [x] kf6-kfilemetadata: media tags show under properties of a media file
- [x] kodi: launches, media tags work
- [x] gst-plugins-good1: works
- [x] soundkonverter: works
A patch file from https://github.com/void-linux/void-packages/pull/54493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-strawberry-54493.patch --]
[-- Type: text/x-diff, Size: 101236 bytes --]
From ed210806592b9ab4badc5cee1e5f5d9106574cc7 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:18:01 +0100
Subject: [PATCH 01/41] taglib: update to 2.0.2
---
common/shlibs | 4 ++--
srcpkgs/taglib/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 356a859383f37e..dd660883df0b4d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -415,9 +415,9 @@ libSDL_image-1.2.so.0 SDL_image-1.2.10_1
libx264.so.157 x264-20190507.2245_1
libopenh264.so.7 openh264-2.4.1_1
libxvidcore.so.4 xvidcore-1.2.2_1
-libtag.so.1 taglib-1.6.1_1
+libtag.so.2 taglib-2.0.2_1
libtag-extras.so.1 taglib-extras-1.0.1_1
-libtag_c.so.0 taglib-1.6.1_1
+libtag_c.so.2 taglib-2.0.2_1
libfribidi.so.0 fribidi-0.19.2_1
liba52.so.0 liba52-0.7.4_1
libcddb.so.2 libcddb-1.3.2_1
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index b8fc616ff4b444..53b3f62a2ed46e 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,17 +1,17 @@
# Template file for 'taglib'
pkgname=taglib
-version=1.13.1
+version=2.0.2
revision=1
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="zlib-devel"
+makedepends="zlib-devel vtk-devel utfcpp"
short_desc="Library for accessing ID tags in various media files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MPL-1.1"
homepage="https://taglib.github.io/"
distfiles="https://github.com/taglib/taglib/archive/v${version}.tar.gz"
-checksum=c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b
+checksum=0de288d7fe34ba133199fd8512f19cc1100196826eafcb67a33b224ec3a59737
taglib-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From a0a7095b98b4c0e0007e1f6ee70b204d939c166d Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:20:00 +0100
Subject: [PATCH 02/41] New package: utfcpp-4.0.6
---
srcpkgs/utfcpp/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/utfcpp/template
diff --git a/srcpkgs/utfcpp/template b/srcpkgs/utfcpp/template
new file mode 100644
index 00000000000000..9e7b08f8b0fc30
--- /dev/null
+++ b/srcpkgs/utfcpp/template
@@ -0,0 +1,16 @@
+# Template file for 'utfcpp'
+pkgname=utfcpp
+version=4.0.6
+revision=1
+build_style=cmake
+configure_args="-DUTF8_TESTS=OFF -DBUILD_SHARED_LIBS=ON"
+short_desc="Generic library that handles UTF-8 encoded strings"
+maintainer="Mateusz Sylwestrzak <slymattz@gmail.com>"
+license="BSL-1.0"
+homepage="https://github.com/nemtrif/utfcpp"
+distfiles="https://github.com/nemtrif/utfcpp/archive/v${version}.tar.gz"
+checksum=6920a6a5d6a04b9a89b2a89af7132f8acefd46e0c2a7b190350539e9213816c0
+
+post_install() {
+ vlicense LICENSE
+}
From 11eb0fcfe3ef3f409c00c17933521e3c58839a00 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:23:15 +0100
Subject: [PATCH 03/41] ario: revbump for libtag_c
---
srcpkgs/ario/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index 52157b997ccba6..409c05f5c9e492 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
From 0ee8ed942952cf2819a98075f6892fdeacd22cb8 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:25:00 +0100
Subject: [PATCH 04/41] moc: revbump for libtag_c
---
srcpkgs/moc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index 3a04932c8f1e61..e07f9f2e9cd2af 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
# Template file for 'moc'
pkgname=moc
version=2.5.2
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
From 3c3c5904efc3dd6aad0ab29d00e9eb927770e62b Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:26:34 +0100
Subject: [PATCH 05/41] parole: revbump for libtag_c
---
srcpkgs/parole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index c6e498e454b43e..d480b1f91a2db1 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,7 +1,7 @@
# Template file for 'parole'
pkgname=parole
version=4.18.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config gettext glib-devel"
makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
From 3aaec09d8f0fb74e87b077a34774d93878e151f6 Mon Sep 17 00:00:00 2001
From: Mateusz Sylwestrzak <slymattz@gmail.com>
Date: Tue, 25 Feb 2025 20:28:11 +0100
Subject: [PATCH 06/41] pragha: revbump for libtag_c
---
srcpkgs/pragha/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index b71c51fe8baa8c..0996ca9bcbe815 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
# Template file for 'pragha'
pkgname=pragha
version=1.3.4
-revision=1
+revision=2
build_style=gnu-configure
hostmak