bump

2 files changed, 24 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0aa457100570..699afbbde059 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kaudiocreator-git
 	pkgdesc = A program for ripping and encoding Audio-CDs, encoding files from disk. (GIT version)
 	pkgver = 1.3.r886.f21c160
-	pkgrel = 1
+	pkgrel = 2
 	url = https://kde.org/applications/en/unmaintained/org.kde.kaudiocreator
 	arch = x86_64
 	license = GPL
@@ -16,7 +16,7 @@ pkgbase = kaudiocreator-git
 	depends = glibc
 	depends = qt5-base
 	depends = bash
-	depends = taglib
+	depends = taglib1
 	depends = libmusicbrainz5
 	depends = libmusicbrainz5.so
 	depends = libdiscid
@@ -43,6 +43,8 @@ pkgbase = kaudiocreator-git
 	conflicts = kaudiocreator
 	source = git+https://invent.kde.org/unmaintained/kaudiocreator.git
 	source = git+https://invent.kde.org/multimedia/libkcddb.git#branch=release/20.04
+	source = git+https://invent.kde.org/multimedia/libkcompactdisc.git#branch=release/20.04
+	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 7b75cbb7202d..92680eccd426 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=kaudiocreator-git
 pkgver=1.3.r886.f21c160
-pkgrel=1
+pkgrel=2
 pkgdesc="A program for ripping and encoding Audio-CDs, encoding files from disk. (GIT version)"
 arch=('x86_64')
 url='https://kde.org/applications/en/unmaintained/org.kde.kaudiocreator'
@@ -12,7 +12,7 @@ depends=(
   'glibc' # libstdc++.so libc.so
   'qt5-base' # libQt5Core.so libQt5Gui.so libQt5Network.so libQt5Widgets.so
   'bash'
-  'taglib' # libtag.so
+  'taglib1' # libtag.so
   'libmusicbrainz5' 'libmusicbrainz5.so'
   'libdiscid' # libdiscid.so
   'kcodecs5' # libKF5Codecs.so
@@ -48,10 +48,12 @@ conflicts=('kaudiocreator')
 provides=('kaudiocreator')
 source=(
   'git+https://invent.kde.org/unmaintained/kaudiocreator.git'
-  'git+https://invent.kde.org/multimedia/libkcddb.git#branch=release/20.04')
+  'git+https://invent.kde.org/multimedia/libkcddb.git#branch=release/20.04'
+  'git+https://invent.kde.org/multimedia/libkcompactdisc.git#branch=release/20.04')
 sha256sums=(
   'SKIP'
   'SKIP'
+  'SKIP'
 )
 
 pkgver() {
@@ -65,6 +67,9 @@ prepare() {
       -e 's|PRIVATE musicbrainz|&5|g' \
       -i libkcddb/libkcddb/CMakeLists.txt
 
+  sed -e 's|SHARED|STATIC|g' \
+      -i libkcompactdisc/src/CMakeLists.txt
+
   sed -e 's|TAGLIB_INCLUDE_DIR|Taglib_INCLUDE_DIRS|g' \
       -e 's|TAGLIB|Taglib|g' \
       -i kaudiocreator/CMakeLists.txt
@@ -80,11 +85,22 @@ build() {
   cmake --build build-libkcddb
   cmake --install build-libkcddb
 
+  cmake -S libkcompactdisc -B build-libkcompactdisc \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_SHARED_LIBS=OFF \
+    -DCMAKE_INSTALL_PREFIX="${srcdir}/fakeroot/usr" \
+    -DBUILD_TESTING=OFF
+
+  cmake --build build-libkcompactdisc
+  cmake --install build-libkcompactdisc
+
+  export PKG_CONFIG_PATH=/usr/lib/taglib1/pkgconfig
   cmake -S kaudiocreator -B build \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DBUILD_TESTING=ON \
-    -DKF5Cddb_DIR="${srcdir}/fakeroot/usr/lib/cmake/KF5Cddb"
+    -DKF5Cddb_DIR="${srcdir}/fakeroot/usr/lib/cmake/KF5Cddb" \
+    -DKF5CompactDisc_DIR="${srcdir}/fakeroot/usr/lib/cmake/KF5CompactDisc"
 
   cmake --build build
 }