From 8e065faf736fe9212cff1b4b16d09d88ad304e5e Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 18:03:56 -0500 Subject: [PATCH 01/45] taglib: update to 2.0.1. --- srcpkgs/taglib/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template index b8fc616ff4b444..649140cbfd4837 100644 --- a/srcpkgs/taglib/template +++ b/srcpkgs/taglib/template @@ -1,6 +1,6 @@ # Template file for 'taglib' pkgname=taglib -version=1.13.1 +version=2.0.1 revision=1 build_style=cmake configure_args="-DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=ON" @@ -11,7 +11,7 @@ maintainer="Orphaned " 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=08c0a27b96aa5c4e23060fe0b6f93102ee9091a9385257b9d0ddcf467de0d925 taglib-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 719df95fafc6c2fc7a9eb86f62377ff29ca9210d Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:03 -0500 Subject: [PATCH 02/45] QMPlay2: rebuild for taglib update --- srcpkgs/QMPlay2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template index b58ef7c089bd4e..58e54fe409f666 100644 --- a/srcpkgs/QMPlay2/template +++ b/srcpkgs/QMPlay2/template @@ -1,7 +1,7 @@ # Template file for 'QMPlay2' pkgname=QMPlay2 version=24.06.16 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools" makedepends="alsa-lib-devel ffmpeg6-devel libass-devel libcdio-devel libgme-devel From 75c13eb514195c0c188e127a8c1ed4b3dbfbf8be Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:04 -0500 Subject: [PATCH 03/45] ardour: rebuild for taglib update --- srcpkgs/ardour/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template index a2d06acbabd057..a1c4c84d6944f7 100644 --- a/srcpkgs/ardour/template +++ b/srcpkgs/ardour/template @@ -1,7 +1,7 @@ # Template file for 'ardour' pkgname=ardour version=8.1 -revision=1 +revision=2 build_style=waf3 configure_args="--cxx11 --no-phone-home --with-backends=jack,alsa,dummy --configdir=/etc From dacd810809239a6289dba304483a65026487f7bd Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:04 -0500 Subject: [PATCH 04/45] ario: rebuild for taglib update --- 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 00ac506a5ef967ced15a11cf821a1f7b8faa0c00 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:05 -0500 Subject: [PATCH 05/45] cantata: rebuild for taglib update --- srcpkgs/cantata/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cantata/template b/srcpkgs/cantata/template index 54e82fbb85dfe8..38e04e5e15d564 100644 --- a/srcpkgs/cantata/template +++ b/srcpkgs/cantata/template @@ -1,7 +1,7 @@ # Template file for 'cantata' pkgname=cantata version=2.5.0 -revision=2 +revision=3 build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools qt5-tools" makedepends="qt5-devel qt5-tools-devel qt5-svg-devel qt5-xmlpatterns-devel From bd8f54a2268a7bee5793d9ff4e4a6fbec641d178 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:06 -0500 Subject: [PATCH 06/45] clementine: rebuild for taglib update --- srcpkgs/clementine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index ce972f80dba6e9..19c77e80c04fce 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,7 +1,7 @@ # Template file for 'clementine' pkgname=clementine version=1.4.0rc1 -revision=14 +revision=15 _fullver=${version}-873-g3471134d5 build_style=cmake configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON From 5d99e367e911d5a813dcf12d7c89cf19e00443a7 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:06 -0500 Subject: [PATCH 07/45] easytag: rebuild for taglib update --- srcpkgs/easytag/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2c468028c86c095b0f9c0f1c49a601b11f7ec2d1 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:07 -0500 Subject: [PATCH 08/45] flacon: rebuild for taglib update --- 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 e69121fdaf8fb75df3f66577dca9f900d744cf81 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:08 -0500 Subject: [PATCH 09/45] gerbera: rebuild for taglib update --- 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 964f166c46ba2ea89ea2029d1e2a7a65171e66ab Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:08 -0500 Subject: [PATCH 10/45] gogglesmm: rebuild for taglib update --- 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 fb0795ff4baabe5c64ee4169a442c89c3b594cd1 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:09 -0500 Subject: [PATCH 11/45] gst-plugins-good1: rebuild for taglib update --- 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 9dd28563c801db..bc91c533e1ddbd 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.6 -revision=1 +revision=2 build_style=meson configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled $(vopt_feature gtk3 gtk3)" From a22538a4e43869c3171258c7940a1da97d8ac735 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:10 -0500 Subject: [PATCH 12/45] id3ted: rebuild for taglib update --- srcpkgs/id3ted/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/id3ted/template b/srcpkgs/id3ted/template index b993e5a37137da..e4dbeef29b2441 100644 --- a/srcpkgs/id3ted/template +++ b/srcpkgs/id3ted/template @@ -1,7 +1,7 @@ # Template file for 'id3ted' pkgname=id3ted version=1.0 -revision=2 +revision=3 build_style=gnu-makefile makedepends="file-devel taglib-devel" short_desc="Command line id3 tag editor" From ae994beae8c1e5c2806572eb30779b8c76d4048e Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:10 -0500 Subject: [PATCH 13/45] juk: rebuild for taglib update --- srcpkgs/juk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template index 32af0a15c68207..b9b66c1e00451b 100644 --- a/srcpkgs/juk/template +++ b/srcpkgs/juk/template @@ -1,7 +1,7 @@ # Template file for 'juk' pkgname=juk version=24.05.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 db357d339c45d0c910da20597f72cdd1dc9fd563 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:11 -0500 Subject: [PATCH 14/45] k3b: rebuild for taglib update --- srcpkgs/k3b/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template index f78667177d5e4b..2b6dd1008b827f 100644 --- a/srcpkgs/k3b/template +++ b/srcpkgs/k3b/template @@ -1,7 +1,7 @@ # Template file for 'k3b' pkgname=k3b version=24.05.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 -DQT_MAJOR_VERSION=6 From 16c10cc53a165d273c2391f44fb9a17ed387614e Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:12 -0500 Subject: [PATCH 15/45] kasts: rebuild for taglib update --- srcpkgs/kasts/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kasts/template b/srcpkgs/kasts/template index e1c01a80d026f9..5cb5ada972668a 100644 --- a/srcpkgs/kasts/template +++ b/srcpkgs/kasts/template @@ -1,7 +1,7 @@ # Template file for 'kasts' pkgname=kasts version=24.05.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 35810cdbc5df6ebea302e8bea5b0f007624a6c68 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:12 -0500 Subject: [PATCH 16/45] kf6-kfilemetadata: rebuild for taglib update --- 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 154b134a46e437..c252d925ac3c33 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.3.0 -revision=2 +revision=3 build_style=cmake configure_args="-DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" hostmakedepends="extra-cmake-modules qt6-tools qt6-base From 7514481cb70d359836e3ee81ec7eed836fdb7cd2 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:13 -0500 Subject: [PATCH 17/45] kfilemetadata5: rebuild for taglib update --- srcpkgs/kfilemetadata5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template index 51450e80a620fc..9342c6b7958d59 100644 --- a/srcpkgs/kfilemetadata5/template +++ b/srcpkgs/kfilemetadata5/template @@ -1,7 +1,7 @@ # Template file for 'kfilemetadata5' pkgname=kfilemetadata5 version=5.115.0 -revision=2 +revision=3 build_style=cmake hostmakedepends="kcoreaddons extra-cmake-modules pkg-config qt5-host-tools qt5-qmake gettext kcoreaddons python3" From 530441eb0f3e857c1c2167c249920e97682599bf Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:14 -0500 Subject: [PATCH 18/45] kid3: rebuild for taglib update --- srcpkgs/kid3/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kid3/template b/srcpkgs/kid3/template index f3ef498c29ddc7..f8b00a282c9639 100644 --- a/srcpkgs/kid3/template +++ b/srcpkgs/kid3/template @@ -1,7 +1,7 @@ # Template file for 'kid3' pkgname=kid3 version=3.9.5 -revision=2 +revision=3 build_style=cmake configure_args="-DWITH_APPS='CLI;$(vopt_if KDE KDE Qt)' -DWITH_DOCBOOKDIR=/usr/share/xsl/docbook -DWITH_FLAC=$(vopt_if flac ON OFF) From 786303a4f9d2f3a172d35b354f4df4ca278e15d7 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:14 -0500 Subject: [PATCH 19/45] kio-extras: rebuild for taglib update --- 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 136d8fd1e02dc4..b396d043df7ea5 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.05.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 b7af85d234391b2841f19cf693651d1af008b4b6 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:15 -0500 Subject: [PATCH 20/45] kodi: rebuild for taglib update --- srcpkgs/kodi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index 94f8fa33c3cd8e..f412e5a07f2d3c 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi version=21.0 -revision=1 +revision=2 _codename="Omega" _crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681" _dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2" From a785891a2e6d985723faef3a74dd642baeed6c3d Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:16 -0500 Subject: [PATCH 21/45] krename: rebuild for taglib update --- 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 3554c26389e009dd5e576dcd6234902d8745f344 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:16 -0500 Subject: [PATCH 22/45] libtaginfo: rebuild for taglib update --- srcpkgs/libtaginfo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template index 39e4f2aec531cb..0e9497e26723c5 100644 --- a/srcpkgs/libtaginfo/template +++ b/srcpkgs/libtaginfo/template @@ -1,7 +1,7 @@ # Template file for 'libtaginfo' pkgname=libtaginfo version=0.2.1 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="taglib-devel" From 6bcd0a0897951ff080ffde905cfcb9aa3a1bd50a Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:17 -0500 Subject: [PATCH 23/45] lms: rebuild for taglib update --- srcpkgs/lms/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template index 02058c54629c63..1a26c22c30288a 100644 --- a/srcpkgs/lms/template +++ b/srcpkgs/lms/template @@ -1,7 +1,7 @@ # Template file for 'lms' pkgname=lms version=3.56.0 -revision=1 +revision=2 build_style=cmake configure_args="-DLMS_IMAGE_BACKEND=graphicsmagick" hostmakedepends="pkg-config" From 57ee7a59f26b9bfcb97d62e1f4464812b59252da Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:18 -0500 Subject: [PATCH 24/45] loudgain: rebuild for taglib update --- srcpkgs/loudgain/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/loudgain/template b/srcpkgs/loudgain/template index 8d6c6aeb772636..4e6d4ce55089c1 100644 --- a/srcpkgs/loudgain/template +++ b/srcpkgs/loudgain/template @@ -1,7 +1,7 @@ # Template file for 'loudgain' pkgname=loudgain version=0.6.8 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config" makedepends="libebur128-devel taglib-devel ffmpeg6-devel" From ccc1e19d6b4aa7a320406875dd45c81577b6f4e4 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:18 -0500 Subject: [PATCH 25/45] mixxx: rebuild for taglib update --- srcpkgs/mixxx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index 3568315470a260..157bbb7bff311c 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,7 +1,7 @@ # Template file for 'mixxx' pkgname=mixxx version=2.3.3 -revision=8 +revision=9 build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=Release" hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-qmake" From 3b5ef742baf4f64bee3ac5e9fdb202def8d044a1 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:19 -0500 Subject: [PATCH 26/45] moc: rebuild for taglib update --- 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 a4e7bceed34c7758b9c0dbafb91befeaca6ec1f9 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:20 -0500 Subject: [PATCH 27/45] mp3unicode: rebuild for taglib update --- srcpkgs/mp3unicode/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 854c3a42f8a317842e9ffd60c1157f57db0a58ed Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:20 -0500 Subject: [PATCH 28/45] musikcube: rebuild for taglib update --- srcpkgs/musikcube/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template index 7b594ac432a666..b361accdbddd12 100644 --- a/srcpkgs/musikcube/template +++ b/srcpkgs/musikcube/template @@ -1,7 +1,7 @@ # Template file for 'musikcube' pkgname=musikcube version=3.0.2 -revision=2 +revision=3 build_style=cmake make_cmd=make configure_args="-DNO_NCURSESW=1" From 306735b2a24ab0640b94cdceb2dce34cc96581de Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:21 -0500 Subject: [PATCH 29/45] ncmpcpp: rebuild for taglib update --- srcpkgs/ncmpcpp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e83b6cedb1b3c686a68bbc4817123a985bb22c6f Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:22 -0500 Subject: [PATCH 30/45] parole: rebuild for taglib update --- srcpkgs/parole/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template index 793d996e02d920..4e63954a8abd76 100644 --- a/srcpkgs/parole/template +++ b/srcpkgs/parole/template @@ -1,7 +1,7 @@ # Template file for 'parole' pkgname=parole version=4.18.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="pkg-config intltool glib-devel" From fd8be802ab4a97c775c37bea52cc617a15f50bfb Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:22 -0500 Subject: [PATCH 31/45] pragha: rebuild for taglib update --- srcpkgs/pragha/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template index 2fc54d44215821..b2f27fa11a4e6f 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 f897601f5677fda1cf383cce24b7eab6df3c0904 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:23 -0500 Subject: [PATCH 32/45] python3-pytaglib: rebuild for taglib update --- srcpkgs/python3-pytaglib/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template index 147b444167e533..f2e95a4f3bd3c2 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=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" makedepends="python3-devel taglib-devel" From 5bb9b347dfc057e0a6e5d2d201831d1fc9f5d4b2 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:24 -0500 Subject: [PATCH 33/45] qmmp: rebuild for taglib update --- srcpkgs/qmmp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template index e96175b05eaed6..ddf41646073c4a 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 +revision=5 build_style=cmake configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple" hostmakedepends="pkg-config qt5-host-tools qt5-qmake" From 18dc627fc45d9cb44fc90c95ad79502b20e8c76c Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:24 -0500 Subject: [PATCH 34/45] quimup: rebuild for taglib update --- srcpkgs/quimup/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/quimup/template b/srcpkgs/quimup/template index edec0a09e5a29e..33f27038824bb1 100644 --- a/srcpkgs/quimup/template +++ b/srcpkgs/quimup/template @@ -1,7 +1,7 @@ # Template file for 'quimup' pkgname=quimup version=1.4.4 -revision=1 +revision=2 build_style=qmake configure_args="INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5' INCLUDEPATH+='${XBPS_CROSS_BASE}/usr/include/qt5/QtCore' From 774097285b290b472c1802ddcf6e2084a1f5e8b2 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:25 -0500 Subject: [PATCH 35/45] soundkonverter: rebuild for taglib update --- srcpkgs/soundkonverter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e6ad8cf78cd472980a89017bdebd7fe61efbb3c2 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:26 -0500 Subject: [PATCH 36/45] strawberry: rebuild for taglib update --- srcpkgs/strawberry/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template index dd69bd35fabb63..4dd7f2830b92a3 100644 --- a/srcpkgs/strawberry/template +++ b/srcpkgs/strawberry/template @@ -1,7 +1,7 @@ # Template file for 'strawberry' pkgname=strawberry version=1.1.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config protobuf gettext" makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel From 442fa4e7b18e72c5d95ded646c9771ec8dc1df8e Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:26 -0500 Subject: [PATCH 37/45] taglib-extras: rebuild for taglib update --- srcpkgs/taglib-extras/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From d7a91f4f1e4db3ec148c6df4e6139398918cdb98 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:27 -0500 Subject: [PATCH 38/45] tellico: rebuild for taglib update --- srcpkgs/tellico/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template index d20e33769d9a3d..8153bf85954d9b 100644 --- a/srcpkgs/tellico/template +++ b/srcpkgs/tellico/template @@ -1,7 +1,7 @@ # Template file for 'tellico' pkgname=tellico version=3.3.4 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_WEBCAM=$(vopt_if webcam ON OFF)" hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig From 6bdd3733114bae663721301dc18d5b19b771a069 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:28 -0500 Subject: [PATCH 39/45] thunar-media-tags-plugin: rebuild for taglib update --- 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 5088f7bf4aba52..bb46fbe0505829 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.4.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="intltool pkg-config" From 2eb5532e29826236d68f8e80f929530e5cc5f2d6 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:29 -0500 Subject: [PATCH 40/45] vimpc: rebuild for taglib update --- 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 2b13e9cbbd9e8b3f2cdc2e3750750cf0878bba73 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:11:29 -0500 Subject: [PATCH 41/45] vlc: rebuild for taglib update --- srcpkgs/vlc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9afd9cb82350bd25fd31cc518d61e846df069550 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:14:15 -0500 Subject: [PATCH 42/45] taglib: update to 2.0.1. --- common/shlibs | 4 ++-- srcpkgs/taglib/template | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 73543c903194a9..e2e98cf80ec69f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -416,9 +416,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.1_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.1_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 649140cbfd4837..959c7ac93b4321 100644 --- a/srcpkgs/taglib/template +++ b/srcpkgs/taglib/template @@ -5,7 +5,7 @@ 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 utfcpp" short_desc="Library for accessing ID tags in various media files" maintainer="Orphaned " license="LGPL-2.1-or-later, MPL-1.1" From 0961a258dd1cc860402c083750fc10b52c5f79f3 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 20:14:36 -0500 Subject: [PATCH 43/45] New package: utfcpp-4.0.5 --- 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..aa705b357427c5 --- /dev/null +++ b/srcpkgs/utfcpp/template @@ -0,0 +1,16 @@ +# Template file for 'utfcpp' +pkgname=utfcpp +version=4.0.5 +revision=1 +build_style=cmake +hostmakedepends="pkg-config" +short_desc="UTF-8 with C++ in a Portable Way" +maintainer="rooyca " +license="BSL-1.0" +homepage="https://github.com/nemtrif/utfcpp" +distfiles="https://github.com/nemtrif/utfcpp/archive/refs/tags/v${version}.tar.gz" +checksum=ffc668a310e77607d393f3c18b32715f223da1eac4c4d6e0579a11df8e6b59cf + +post_install() { + vlicense LICENSE +} From 414f5ff517fec81e63e28864a79a62cced922c8a Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 21:35:33 -0500 Subject: [PATCH 44/45] vlc: update to 3.0.21. --- srcpkgs/vlc/patches/taglib2.patch | 63 +++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 srcpkgs/vlc/patches/taglib2.patch diff --git a/srcpkgs/vlc/patches/taglib2.patch b/srcpkgs/vlc/patches/taglib2.patch new file mode 100644 index 00000000000000..862ef586bcc34f --- /dev/null +++ b/srcpkgs/vlc/patches/taglib2.patch @@ -0,0 +1,63 @@ +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(f.file()) ) + WriteMetaToId3v2( riff_aiff->tag(), p_item ); + else if( RIFF::WAV::File* riff_wav = dynamic_cast(f.file()) ) +- WriteMetaToId3v2( riff_wav->tag(), p_item ); ++ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item ); + } + else if( TrueAudio::File* trueaudio = dynamic_cast(f.file()) ) + { From 0a4e6bcc401f193911769fdb5c801b62a2389d88 Mon Sep 17 00:00:00 2001 From: rooyca Date: Wed, 7 Aug 2024 22:35:29 -0500 Subject: [PATCH 45/45] taglib-extras: update to 1.0.1. --- srcpkgs/taglib-extras/patches/taglib2.diff | 319 +++++++++++++++++++++ 1 file changed, 319 insertions(+) create mode 100644 srcpkgs/taglib-extras/patches/taglib2.diff diff --git a/srcpkgs/taglib-extras/patches/taglib2.diff b/srcpkgs/taglib-extras/patches/taglib2.diff new file mode 100644 index 00000000000000..956009c6e12bad --- /dev/null +++ b/srcpkgs/taglib-extras/patches/taglib2.diff @@ -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);