From d28225baaa350acaf1bea3e866e94b60409c2b3a Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Tue, 15 Mar 2022 20:28:48 +0530 Subject: [PATCH 1/3] musikcube: update to 0.97.0 --- .../patches/fix-install-locations.patch | 26 +++++++++---------- srcpkgs/musikcube/template | 6 ++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/srcpkgs/musikcube/patches/fix-install-locations.patch b/srcpkgs/musikcube/patches/fix-install-locations.patch index 63537349f450..590f27bf1a7d 100644 --- a/srcpkgs/musikcube/patches/fix-install-locations.patch +++ b/srcpkgs/musikcube/patches/fix-install-locations.patch @@ -1,11 +1,11 @@ Currently all ELF files (binaries and libraries), get installed to /usr/share/musikcube. This patch moves all those files to their normal locations and fixes the code to expect that -diff --git CMakeLists.txt CMakeLists.txt -index d685695f..5ac43f1f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -208,7 +208,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") +diff --git a/.cmake/InstallFiles.cmake b/.cmake/InstallFiles.cmake +index 62d3c003..01ef58ac 100644 +--- a/.cmake/InstallFiles.cmake ++++ b/.cmake/InstallFiles.cmake +@@ -4,7 +4,7 @@ if (APPLE) install(FILES ${plugins} DESTINATION share/musikcube/plugins) else () file(GLOB plugins "bin/plugins/*.so") @@ -13,9 +13,9 @@ index d685695f..5ac43f1f 100644 + install(FILES ${plugins} DESTINATION lib/musikcube/plugins) endif () - file(GLOB sdk_headers "src/musikcore/sdk/*.h") -@@ -237,20 +237,12 @@ endif() - if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + if (${BUILD_STANDALONE} MATCHES "true") +@@ -43,20 +43,12 @@ endif() + if (APPLE) install(FILES "bin/libmusikcore.dylib" DESTINATION share/musikcube) else() - install(FILES "bin/libmusikcore.so" DESTINATION share/musikcube) @@ -36,7 +36,7 @@ index d685695f..5ac43f1f 100644 DESTINATION bin/ PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE -@@ -260,14 +252,6 @@ install( +@@ -66,14 +58,6 @@ install( # executable and shell script for daemon install( FILES bin/musikcubed @@ -51,12 +51,12 @@ index d685695f..5ac43f1f 100644 DESTINATION bin/ PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE -diff --git src/musikcore/support/Common.cpp src/musikcore/support/Common.cpp -index 58bc4d2f..1670c2f7 100644 +diff --git a/src/musikcore/support/Common.cpp b/src/musikcore/support/Common.cpp +index 31703117..53aa8a88 100644 --- a/src/musikcore/support/Common.cpp +++ b/src/musikcore/support/Common.cpp -@@ -90,65 +90,11 @@ namespace musik { namespace core { - } +@@ -82,65 +82,11 @@ static inline void silentDelete(const std::string fn) { + namespace musik { namespace core { std::string GetPluginDirectory() { - std::string path(GetApplicationDirectory()); diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template index d8d4e73d6b4b..a7555a1a9a9f 100644 --- a/srcpkgs/musikcube/template +++ b/srcpkgs/musikcube/template @@ -1,6 +1,6 @@ # Template file for 'musikcube' pkgname=musikcube -version=0.96.10 +version=0.97.0 revision=1 build_style=cmake make_cmd=make @@ -10,13 +10,13 @@ hostmakedepends="pkg-config" makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel - sndio-devel pipewire-devel" + sndio-devel pipewire-devel ncurses-libtinfo-devel" short_desc="Terminal-based music player in c++" maintainer="eater <=@eater.me>" license="BSD-3-Clause" homepage="https://musikcube.com/" distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz" -checksum=91fd984e68b6ef66f1be1ecdf0c84607453ec6ec80632ece688ac745c7719ea5 +checksum=ab170c5100251fcd6c8fd3c32eea45e9854c6c6272c6b0970bffbfc55d0b2ec5 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From 4556c55f305a8043f9eb4917035a2a16d5d5b88d Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Wed, 16 Mar 2022 09:53:08 +0530 Subject: [PATCH 2/3] musikcube: Create musikcube-openmpt --- srcpkgs/musikcube-openmpt | 1 + srcpkgs/musikcube/template | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/musikcube-openmpt diff --git a/srcpkgs/musikcube-openmpt b/srcpkgs/musikcube-openmpt new file mode 120000 index 000000000000..b3cc8e74bf48 --- /dev/null +++ b/srcpkgs/musikcube-openmpt @@ -0,0 +1 @@ +musikcube \ No newline at end of file diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template index a7555a1a9a9f..a7d527b6b506 100644 --- a/srcpkgs/musikcube/template +++ b/srcpkgs/musikcube/template @@ -10,7 +10,7 @@ hostmakedepends="pkg-config" makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel - sndio-devel pipewire-devel ncurses-libtinfo-devel" + sndio-devel pipewire-devel ncurses-libtinfo-devel libopenmpt-devel" short_desc="Terminal-based music player in c++" maintainer="eater <=@eater.me>" license="BSD-3-Clause" @@ -56,3 +56,11 @@ musikcube-pipewire_package() { vmove usr/lib/musikcube/plugins/libpipewireout.so } } + +musikcube-openmpt_package() { + depends="musikcube>=${version}_${revision}" + short_desc+=" - openmpt decoder plugin" + pkg_install() { + vmove usr/lib/musikcube/plugins/libopenmptdecoder.so + } +} From abaaa6ff6375d92a512a592cd894cab63bab646c Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Wed, 16 Mar 2022 09:55:22 +0530 Subject: [PATCH 3/3] musikcube: Enable MPRIS support --- srcpkgs/musikcube/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template index a7d527b6b506..580284d60f88 100644 --- a/srcpkgs/musikcube/template +++ b/srcpkgs/musikcube/template @@ -10,13 +10,17 @@ hostmakedepends="pkg-config" makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel - sndio-devel pipewire-devel ncurses-libtinfo-devel libopenmpt-devel" + sndio-devel pipewire-devel ncurses-libtinfo-devel libopenmpt-devel + $(vopt_if elogind elogind-devel)" short_desc="Terminal-based music player in c++" maintainer="eater <=@eater.me>" license="BSD-3-Clause" homepage="https://musikcube.com/" distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz" checksum=ab170c5100251fcd6c8fd3c32eea45e9854c6c6272c6b0970bffbfc55d0b2ec5 +build_options="elogind" +build_options_default="elogind" +desc_option_elogind="Support MPRIS interface via elogind" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel"