summaryrefslogtreecommitdiffstats
path: root/arch/tde-extra/tde-amarok
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2024-10-18 04:08:19 +0200
committerSlávek Banko <[email protected]>2024-10-24 04:08:19 +0200
commit88660b1b05e92c192c13144e4536d541af0e44fa (patch)
treed63ff1d27889d53b2c644eba8bc880683280cdf3 /arch/tde-extra/tde-amarok
parent3dca8bbc0b29007611c7ef89a7f16bc925fb9216 (diff)
downloadtde-packaging-88660b1b05e92c192c13144e4536d541af0e44fa.tar.gz
tde-packaging-88660b1b05e92c192c13144e4536d541af0e44fa.zip
ArchLinux: Update for final R14.1.3.
Add pkgbuilds for several applications. Add pkgbuild for libvisual dependency. Signed-off-by: Slávek Banko <[email protected]>
Diffstat (limited to 'arch/tde-extra/tde-amarok')
-rw-r--r--arch/tde-extra/tde-amarok/PKGBUILD15
-rw-r--r--arch/tde-extra/tde-amarok/bp000-add-taglib2-support-part2.diff40
2 files changed, 3 insertions, 52 deletions
diff --git a/arch/tde-extra/tde-amarok/PKGBUILD b/arch/tde-extra/tde-amarok/PKGBUILD
index ed5197093..2480de9a9 100644
--- a/arch/tde-extra/tde-amarok/PKGBUILD
+++ b/arch/tde-extra/tde-amarok/PKGBUILD
@@ -5,7 +5,7 @@ _cat=applications/multimedia/
_kdemod="${_mod/tde/kde}"
pkgname="tde-${_mod}"
-pkgver=14.1.2
+pkgver=14.1.3
pkgrel=1
pkgdesc="TDE Amarok"
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
@@ -18,20 +18,12 @@ provides=("${_mod}")
conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}")
replaces=("trinity-${_mod}")
options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
- 'bp000-add-taglib2-support-part2.diff')
-md5sums=('f2c48a2061d9718cad303279f1e54922'
- '7fe8fa72bbe23a685a5e4344b804f6c8')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('580add936b11632d66123a6fad9cd9a8')
install=''
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
-prepare() {
- msg "Apply backported patches"
- cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1
- patch -p1 < ${srcdir}/bp000-add-taglib2-support-part2.diff
-}
-
build() {
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p ${srcdir}/build
@@ -50,7 +42,6 @@ build() {
-DWITH_NJB=OFF \
-DWITH_IFP=OFF \
-DWITH_IPOD=OFF \
- -DWITH_MP4V2=OFF \
-DWITH_EMBEDDED_SQLITE=ON \
-DWITH_SYSTEM_SQLITE=OFF \
-DWITH_MYSQL=OFF \
diff --git a/arch/tde-extra/tde-amarok/bp000-add-taglib2-support-part2.diff b/arch/tde-extra/tde-amarok/bp000-add-taglib2-support-part2.diff
deleted file mode 100644
index c92bfae7d..000000000
--- a/arch/tde-extra/tde-amarok/bp000-add-taglib2-support-part2.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 4a0485854f175f1aef5332edfe70164beb4e05fd
-Author: Slávek Banko <[email protected]>
-Date: Fri Apr 26 11:33:36 2024 +0200
-
- Add support for taglib 2, part 2.
-
- Signed-off-by: Slávek Banko <[email protected]>
-
-diff --git a/amarok/src/metadata/m4a/mp4file.cpp b/amarok/src/metadata/m4a/mp4file.cpp
-index b210f1ec..a1733a67 100644
---- a/amarok/src/metadata/m4a/mp4file.cpp
-+++ b/amarok/src/metadata/m4a/mp4file.cpp
-@@ -131,12 +131,12 @@ uint MP4::File::readSystemsLen()
- uint length = 0;
- uint nbytes = 0;
- ByteVector input;
-- TagLib::uchar tmp_input;
-+ uchar tmp_input;
-
- do
- {
- input = readBlock(1);
-- tmp_input = static_cast<TagLib::uchar>(input[0]);
-+ tmp_input = static_cast<uchar>(input[0]);
- nbytes++;
- length = (length<<7) | (tmp_input&0x7F);
- } while( (tmp_input&0x80) && (nbytes<4) );
-diff --git a/amarok/src/metadata/m4a/mp4isofullbox.cpp b/amarok/src/metadata/m4a/mp4isofullbox.cpp
-index c8963ba2..b104681f 100644
---- a/amarok/src/metadata/m4a/mp4isofullbox.cpp
-+++ b/amarok/src/metadata/m4a/mp4isofullbox.cpp
-@@ -55,7 +55,7 @@ void MP4::Mp4IsoFullBox::parsebox()
- parse();
- }
-
--TagLib::uchar MP4::Mp4IsoFullBox::version()
-+uchar MP4::Mp4IsoFullBox::version()
- {
- return d->version;
- }