aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2021-02-25 09:40:28 +0100
committerBart Ribbers <bribbers@disroot.org>2021-02-25 12:06:51 +0100
commit829d1401f13956c52907a7fce926ea260df8fd98 (patch)
tree7cca4cb9209edc6cb438534196b9b33b378c64cc
parent5ad9e4072ccf55309645d628fcaafbb81e88650c (diff)
community/vvave: upgrade to 1.2.1
-rw-r--r--community/vvave/APKBUILD19
-rw-r--r--community/vvave/vvave-taglib1.2.patch15
2 files changed, 29 insertions, 5 deletions
diff --git a/community/vvave/APKBUILD b/community/vvave/APKBUILD
index 54195a44462..3febde92f12 100644
--- a/community/vvave/APKBUILD
+++ b/community/vvave/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=vvave
-pkgver=1.2.0
+pkgver=1.2.1
pkgrel=0
pkgdesc="VVAVE Music Player"
# armhf blocked by qt5-qtdeclarative
@@ -27,9 +27,17 @@ makedepends="
syntax-highlighting-dev
taglib-dev
"
-source="https://invent.kde.org/maui/vvave/-/archive/v$pkgver/vvave-v$pkgver.tar.gz"
+source="https://download.kde.org/stable/maui/vvave/$pkgver/vvave-$pkgver.tar.xz
+ vvave-taglib1.2.patch
+ "
options="!check" # No tests
-builddir="$srcdir/$pkgname-v$pkgver"
+
+prepare() {
+ default_prepare
+
+ # Fix build with taglib 1.2
+ rm cmake/FindTaglib.cmake
+}
build() {
cmake -B build \
@@ -44,6 +52,7 @@ check() {
}
package() {
- DESTDIR="$pkgdir" cmake --build build --target install
+ DESTDIR="$pkgdir" cmake --install build
}
-sha512sums="3840d31d6a46efbc5b0c555950b3de5a06e5f776455afe5f42eccca780592a2ec06a96456c18571dc8423bbfb40cd023fea158bb7d396e6492672f6345956f63 vvave-v1.2.0.tar.gz"
+sha512sums="5e0b8ec9487e4bee22cfe9e47baf0856195519b393aacb5c9de259881c0ba1bc880c809ebc9695c2aeec7d5d23f947d2ee2b57785a41d136ffb8e30bfdbc18cf vvave-1.2.1.tar.xz
+b96ef8323c463be9252c736ae8651956781e88796087c6072a7e6702916038464e125039b83244249b0d7b7318ad41c63ef5678aff81d4d011760555d099855d vvave-taglib1.2.patch"
diff --git a/community/vvave/vvave-taglib1.2.patch b/community/vvave/vvave-taglib1.2.patch
new file mode 100644
index 00000000000..839b7aca4f5
--- /dev/null
+++ b/community/vvave/vvave-taglib1.2.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a67905f..6c80698 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -128,8 +128,8 @@ endif()
+ target_compile_definitions(vvave
+ PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
+
+-target_include_directories(vvave PRIVATE ${TAGLIB_INCLUDE_DIRS})
+-target_link_libraries(vvave MauiKit Qt5::Network Qt5::Sql Qt5::Qml Qt5::Xml Qt5::Multimedia Qt5::QuickControls2 KF5::CoreAddons KF5::I18n ${TAGLIB_LIBRARIES})
++target_include_directories(vvave PRIVATE Taglib:Taglib)
++target_link_libraries(vvave MauiKit Qt5::Network Qt5::Sql Qt5::Qml Qt5::Xml Qt5::Multimedia Qt5::QuickControls2 KF5::CoreAddons KF5::I18n Taglib::Taglib)
+
+ if(UNIX AND NOT APPLE AND NOT ANDROID)
+ install(TARGETS vvave ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})