This commit is contained in:
slymattz 2025-04-10 21:51:05 +02:00 committed by GitHub
commit 3beaa6c615
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
54 changed files with 1186 additions and 240 deletions

View file

@ -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
@ -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

View file

@ -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

View file

@ -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

View file

@ -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" ;;

View file

@ -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"

View file

@ -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

View file

@ -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;

View file

@ -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="

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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)"

View file

@ -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

View file

@ -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"

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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"

View file

@ -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)

View file

@ -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"

View file

@ -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}"
}

View file

@ -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

View file

@ -1 +0,0 @@
libtaginfo

View file

@ -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
}
}

View file

@ -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"

View file

@ -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);

View file

@ -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)

View file

@ -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
}

View file

@ -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

View file

@ -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

View file

@ -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;
}

View file

@ -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"

View file

@ -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"

View file

@ -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);

View file

@ -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() {

View file

@ -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"

View file

@ -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"

View file

@ -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

View file

@ -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)

View file

@ -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"

View file

@ -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
}

View file

@ -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
@ -456,6 +457,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
@ -489,6 +492,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

View file

@ -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();

View file

@ -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"

View file

@ -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

View file

@ -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);

View file

@ -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"
}
}

View file

@ -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}"

View file

@ -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

View file

@ -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"

16
srcpkgs/utfcpp/template Normal file
View file

@ -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
}

View file

@ -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"

View file

@ -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()) )
{

View file

@ -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