* Re: [PR PATCH] [Updated] musikcube: update to 0.97.0
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
@ 2022-03-16 3:37 ` subnut
2022-03-16 4:20 ` [PR PATCH] [Updated] musikcube: update to 0.97.0 and create musikcube-openmpt subnut
` (14 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: subnut @ 2022-03-16 3:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages musikcube
https://github.com/void-linux/void-packages/pull/36158
musikcube: update to 0.97.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES** (it builds and runs)
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36158.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musikcube-36158.patch --]
[-- Type: text/x-diff, Size: 4601 bytes --]
From accfee711a0eab6afb91e8540f0b69d8383be143 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH] musikcube: update to 0.97.0
---
srcpkgs/musikcube-openmpt | 1 +
.../patches/fix-install-locations.patch | 26 +++++++++----------
srcpkgs/musikcube/template | 14 +++++++---
3 files changed, 25 insertions(+), 16 deletions(-)
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/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..a7d527b6b506 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 libopenmpt-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"
@@ -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
+ }
+}
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] musikcube: update to 0.97.0 and create musikcube-openmpt
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
2022-03-16 3:37 ` [PR PATCH] [Updated] " subnut
@ 2022-03-16 4:20 ` subnut
2022-03-16 4:20 ` subnut
` (13 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: subnut @ 2022-03-16 4:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1271 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages musikcube
https://github.com/void-linux/void-packages/pull/36158
musikcube: update to 0.97.0 and create musikcube-openmpt
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES** (it builds and runs)
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36158.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musikcube-36158.patch --]
[-- Type: text/x-diff, Size: 4267 bytes --]
From 1d6daf079740ccd8c7602cb334b78ac604dd15a1 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH] musikcube: update to 0.97.0
---
srcpkgs/musikcube-openmpt | 1 +
.../patches/fix-install-locations.patch | 26 +++++++++----------
srcpkgs/musikcube/template | 6 ++---
3 files changed, 17 insertions(+), 16 deletions(-)
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/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"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] musikcube: update to 0.97.0 and create musikcube-openmpt
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
2022-03-16 3:37 ` [PR PATCH] [Updated] " subnut
2022-03-16 4:20 ` [PR PATCH] [Updated] musikcube: update to 0.97.0 and create musikcube-openmpt subnut
@ 2022-03-16 4:20 ` subnut
2022-03-16 4:24 ` subnut
` (12 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: subnut @ 2022-03-16 4:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1271 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages musikcube
https://github.com/void-linux/void-packages/pull/36158
musikcube: update to 0.97.0 and create musikcube-openmpt
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES** (it builds and runs)
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36158.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musikcube-36158.patch --]
[-- Type: text/x-diff, Size: 3947 bytes --]
From d28225baaa350acaf1bea3e866e94b60409c2b3a Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH] 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"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] musikcube: update to 0.97.0 and create musikcube-openmpt
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
` (2 preceding siblings ...)
2022-03-16 4:20 ` subnut
@ 2022-03-16 4:24 ` subnut
2022-03-16 5:00 ` subnut
` (11 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: subnut @ 2022-03-16 4:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1271 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages musikcube
https://github.com/void-linux/void-packages/pull/36158
musikcube: update to 0.97.0 and create musikcube-openmpt
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES** (it builds and runs)
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36158.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musikcube-36158.patch --]
[-- Type: text/x-diff, Size: 6942 bytes --]
From d28225baaa350acaf1bea3e866e94b60409c2b3a Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
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 <sn03.general@gmail.com>
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 <sn03.general@gmail.com>
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"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] musikcube: update to 0.97.0 and create musikcube-openmpt
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
` (3 preceding siblings ...)
2022-03-16 4:24 ` subnut
@ 2022-03-16 5:00 ` subnut
2022-03-16 5:14 ` subnut
` (10 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: subnut @ 2022-03-16 5:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1271 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages musikcube
https://github.com/void-linux/void-packages/pull/36158
musikcube: update to 0.97.0 and create musikcube-openmpt
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES** (it builds and runs)
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36158.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musikcube-36158.patch --]
[-- Type: text/x-diff, Size: 7984 bytes --]
From d28225baaa350acaf1bea3e866e94b60409c2b3a Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
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 <sn03.general@gmail.com>
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 b8f2d4ec8e21f6a52e41567f5b851a9e821d9eeb Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Wed, 16 Mar 2022 09:55:22 +0530
Subject: [PATCH 3/3] musikcube: Enable MPRIS support
---
.../musikcube/patches/fix-mpris-detection.patch | 15 +++++++++++++++
srcpkgs/musikcube/template | 6 +++++-
2 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musikcube/patches/fix-mpris-detection.patch
diff --git a/srcpkgs/musikcube/patches/fix-mpris-detection.patch b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
new file mode 100644
index 000000000000..aea0ad150e31
--- /dev/null
+++ b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
@@ -0,0 +1,15 @@
+In Void linux, elogind provides libsystemd
+
+diff --git a/.cmake/AddOsSpecificPlugins.cmake b/.cmake/AddOsSpecificPlugins.cmake
+index ce0eea9b..5b067671 100644
+--- a/.cmake/AddOsSpecificPlugins.cmake
++++ b/.cmake/AddOsSpecificPlugins.cmake
+@@ -6,7 +6,7 @@ endif()
+
+ # systemd / MPRIS detection
+ if (NOT ENABLE_MPRIS MATCHES "false")
+- find_library(LIB_SYSTEMD NAMES systemd)
++ find_library(LIB_SYSTEMD NAMES elogind)
+ if (NOT LIB_SYSTEMD MATCHES "LIB_SYSTEMD-NOTFOUND")
+ message(STATUS "[mpris] systemd found at " ${LIB_SYSTEMD})
+ message(STATUS "[mpris] setting ENABLE_MPRIS=true")
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"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] musikcube: update to 0.97.0 and create musikcube-openmpt
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
` (4 preceding siblings ...)
2022-03-16 5:00 ` subnut
@ 2022-03-16 5:14 ` subnut
2022-03-16 11:58 ` musikcube: update to 0.97.0 and enable new features subnut
` (9 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: subnut @ 2022-03-16 5:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1271 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages musikcube
https://github.com/void-linux/void-packages/pull/36158
musikcube: update to 0.97.0 and create musikcube-openmpt
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES** (it builds and runs)
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36158.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musikcube-36158.patch --]
[-- Type: text/x-diff, Size: 8391 bytes --]
From d28225baaa350acaf1bea3e866e94b60409c2b3a Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
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 21330cfc27d74d4a6d42f65a794be5206d46a2ff Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
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 23aa8fcbcfcc47e0c55c724c80260b43693bf8e7 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Wed, 16 Mar 2022 09:55:22 +0530
Subject: [PATCH 3/3] musikcube: enable MPRIS support
---
.../patches/fix-mpris-detection.patch | 25 +++++++++++++++++++
srcpkgs/musikcube/template | 6 ++++-
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musikcube/patches/fix-mpris-detection.patch
diff --git a/srcpkgs/musikcube/patches/fix-mpris-detection.patch b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
new file mode 100644
index 000000000000..dc7035d06693
--- /dev/null
+++ b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
@@ -0,0 +1,25 @@
+In Void linux, elogind provides libsystemd
+
+diff --git a/.cmake/AddOsSpecificPlugins.cmake b/.cmake/AddOsSpecificPlugins.cmake
+index ce0eea9b..5b067671 100644
+--- a/.cmake/AddOsSpecificPlugins.cmake
++++ b/.cmake/AddOsSpecificPlugins.cmake
+@@ -6,7 +6,7 @@ endif()
+
+ # systemd / MPRIS detection
+ if (NOT ENABLE_MPRIS MATCHES "false")
+- find_library(LIB_SYSTEMD NAMES systemd)
++ find_library(LIB_SYSTEMD NAMES elogind)
+ if (NOT LIB_SYSTEMD MATCHES "LIB_SYSTEMD-NOTFOUND")
+ message(STATUS "[mpris] systemd found at " ${LIB_SYSTEMD})
+ message(STATUS "[mpris] setting ENABLE_MPRIS=true")
+diff --git a/src/plugins/mpris/CMakeLists.txt b/src/plugins/mpris/CMakeLists.txt
+index fdee62d2..7a941d08 100644
+--- a/src/plugins/mpris/CMakeLists.txt
++++ b/src/plugins/mpris/CMakeLists.txt
+@@ -6,4 +6,4 @@ find_package(PkgConfig)
+ pkg_check_modules (SYSTEMD REQUIRED libsystemd)
+
+ add_library(mpris SHARED ${mpris_SOURCES})
+-target_link_libraries(mpris systemd)
++target_link_libraries(mpris elogind)
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"
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: musikcube: update to 0.97.0 and enable new features
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
` (5 preceding siblings ...)
2022-03-16 5:14 ` subnut
@ 2022-03-16 11:58 ` subnut
2022-03-16 12:12 ` paper42
` (8 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: subnut @ 2022-03-16 11:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/36158#issuecomment-1069048131
Comment:
@paper42 Could you please trigger the workflows again?
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: musikcube: update to 0.97.0 and enable new features
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
` (6 preceding siblings ...)
2022-03-16 11:58 ` musikcube: update to 0.97.0 and enable new features subnut
@ 2022-03-16 12:12 ` paper42
2022-03-16 12:48 ` [PR PATCH] [Updated] " subnut
` (7 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-03-16 12:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/36158#issuecomment-1069060203
Comment:
squash commits in this PR
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] musikcube: update to 0.97.0 and enable new features
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
` (7 preceding siblings ...)
2022-03-16 12:12 ` paper42
@ 2022-03-16 12:48 ` subnut
2022-03-16 12:48 ` subnut
` (6 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: subnut @ 2022-03-16 12:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1404 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages musikcube
https://github.com/void-linux/void-packages/pull/36158
musikcube: update to 0.97.0 and enable new features
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Summary
- Update to 0.97.0
- Added MPRIS support
- Moved openmpt plugin to a separate package `musikcube-openmpt`
#### Testing the changes
- I tested the changes in this PR: **YES** (it builds and runs)
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
<!--
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36158.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musikcube-36158.patch --]
[-- Type: text/x-diff, Size: 6334 bytes --]
From 241c9a0ed9f9a23ee867b1ded9b4fe35a3107256 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH] musikcube: update to 0.97.0 and add MPRIS support
- Update to 0.97.0
- Added patch to fix MPRIS support detection
- Moved openmpt plugin to a separate package `musikcube-openmpt`
---
srcpkgs/musikcube-openmpt | 1 +
.../patches/fix-install-locations.patch | 26 +++++++++----------
.../patches/fix-mpris-detection.patch | 25 ++++++++++++++++++
srcpkgs/musikcube/template | 18 ++++++++++---
4 files changed, 54 insertions(+), 16 deletions(-)
create mode 120000 srcpkgs/musikcube-openmpt
create mode 100644 srcpkgs/musikcube/patches/fix-mpris-detection.patch
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/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/patches/fix-mpris-detection.patch b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
new file mode 100644
index 000000000000..dc7035d06693
--- /dev/null
+++ b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
@@ -0,0 +1,25 @@
+In Void linux, elogind provides libsystemd
+
+diff --git a/.cmake/AddOsSpecificPlugins.cmake b/.cmake/AddOsSpecificPlugins.cmake
+index ce0eea9b..5b067671 100644
+--- a/.cmake/AddOsSpecificPlugins.cmake
++++ b/.cmake/AddOsSpecificPlugins.cmake
+@@ -6,7 +6,7 @@ endif()
+
+ # systemd / MPRIS detection
+ if (NOT ENABLE_MPRIS MATCHES "false")
+- find_library(LIB_SYSTEMD NAMES systemd)
++ find_library(LIB_SYSTEMD NAMES elogind)
+ if (NOT LIB_SYSTEMD MATCHES "LIB_SYSTEMD-NOTFOUND")
+ message(STATUS "[mpris] systemd found at " ${LIB_SYSTEMD})
+ message(STATUS "[mpris] setting ENABLE_MPRIS=true")
+diff --git a/src/plugins/mpris/CMakeLists.txt b/src/plugins/mpris/CMakeLists.txt
+index fdee62d2..7a941d08 100644
+--- a/src/plugins/mpris/CMakeLists.txt
++++ b/src/plugins/mpris/CMakeLists.txt
+@@ -6,4 +6,4 @@ find_package(PkgConfig)
+ pkg_check_modules (SYSTEMD REQUIRED libsystemd)
+
+ add_library(mpris SHARED ${mpris_SOURCES})
+-target_link_libraries(mpris systemd)
++target_link_libraries(mpris elogind)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index d8d4e73d6b4b..580284d60f88 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,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"
+ 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=91fd984e68b6ef66f1be1ecdf0c84607453ec6ec80632ece688ac745c7719ea5
+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"
@@ -56,3 +60,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
+ }
+}
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: musikcube: update to 0.97.0 and enable new features
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
` (8 preceding siblings ...)
2022-03-16 12:48 ` [PR PATCH] [Updated] " subnut
@ 2022-03-16 12:48 ` subnut
2022-04-01 2:36 ` [PR PATCH] [Updated] " subnut
` (5 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: subnut @ 2022-03-16 12:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
New comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/36158#issuecomment-1069091103
Comment:
@paper42 Squashed.
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] musikcube: update to 0.97.0 and enable new features
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
` (9 preceding siblings ...)
2022-03-16 12:48 ` subnut
@ 2022-04-01 2:36 ` subnut
2022-04-01 2:46 ` subnut
` (4 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: subnut @ 2022-04-01 2:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages musikcube
https://github.com/void-linux/void-packages/pull/36158
musikcube: update to 0.97.0 and enable new features
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Summary
- Update to 0.97.0
- Added MPRIS support
- Moved openmpt plugin to a separate package `musikcube-openmpt`
#### Testing the changes
- I tested the changes in this PR: **YES** (it works properly)
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
<!--
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36158.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musikcube-36158.patch --]
[-- Type: text/x-diff, Size: 6699 bytes --]
From 0fe7faa30f9641638d405ffe99b1c9fd8b30b178 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH] musikcube: update to 0.97.0 and add MPRIS support
- Update to 0.97.0
- Added patch to fix MPRIS support detection
- Moved openmpt plugin to a separate package `musikcube-openmpt`
---
srcpkgs/musikcube-openmpt | 1 +
.../patches/fix-install-locations.patch | 26 +++++++++---------
.../patches/fix-mpris-detection.patch | 25 +++++++++++++++++
srcpkgs/musikcube/template | 27 ++++++++++++-------
4 files changed, 56 insertions(+), 23 deletions(-)
create mode 120000 srcpkgs/musikcube-openmpt
create mode 100644 srcpkgs/musikcube/patches/fix-mpris-detection.patch
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/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/patches/fix-mpris-detection.patch b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
new file mode 100644
index 000000000000..dc7035d06693
--- /dev/null
+++ b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
@@ -0,0 +1,25 @@
+In Void linux, elogind provides libsystemd
+
+diff --git a/.cmake/AddOsSpecificPlugins.cmake b/.cmake/AddOsSpecificPlugins.cmake
+index ce0eea9b..5b067671 100644
+--- a/.cmake/AddOsSpecificPlugins.cmake
++++ b/.cmake/AddOsSpecificPlugins.cmake
+@@ -6,7 +6,7 @@ endif()
+
+ # systemd / MPRIS detection
+ if (NOT ENABLE_MPRIS MATCHES "false")
+- find_library(LIB_SYSTEMD NAMES systemd)
++ find_library(LIB_SYSTEMD NAMES elogind)
+ if (NOT LIB_SYSTEMD MATCHES "LIB_SYSTEMD-NOTFOUND")
+ message(STATUS "[mpris] systemd found at " ${LIB_SYSTEMD})
+ message(STATUS "[mpris] setting ENABLE_MPRIS=true")
+diff --git a/src/plugins/mpris/CMakeLists.txt b/src/plugins/mpris/CMakeLists.txt
+index fdee62d2..7a941d08 100644
+--- a/src/plugins/mpris/CMakeLists.txt
++++ b/src/plugins/mpris/CMakeLists.txt
+@@ -6,4 +6,4 @@ find_package(PkgConfig)
+ pkg_check_modules (SYSTEMD REQUIRED libsystemd)
+
+ add_library(mpris SHARED ${mpris_SOURCES})
+-target_link_libraries(mpris systemd)
++target_link_libraries(mpris elogind)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index d8d4e73d6b4b..ff92ae6c22f6 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,25 +10,24 @@ 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 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=91fd984e68b6ef66f1be1ecdf0c84607453ec6ec80632ece688ac745c7719ea5
+checksum=ab170c5100251fcd6c8fd3c32eea45e9854c6c6272c6b0970bffbfc55d0b2ec5
+build_options="elogind"
+build_options_default="elogind"
+desc_option_elogind="Support MPRIS interface via elogind"
+
+export CMAKE_GENERATOR="Unix Makefiles"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
- configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-latomic'"
fi
-export CMAKE_GENERATOR="Unix Makefiles"
-
-#XXX: Otherwise xbps-install ffmpeg-devel will complain about unresolving shlibs
-# SDL2-2.0.10_3: broken, unresolvable shlib 'libGL.so.1'
-makedepends+=" libglvnd"
-
post_install() {
vlicense LICENSE.txt
}
@@ -56,3 +55,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
+ }
+}
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: musikcube: update to 0.97.0 and enable new features
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
` (10 preceding siblings ...)
2022-04-01 2:36 ` [PR PATCH] [Updated] " subnut
@ 2022-04-01 2:46 ` subnut
2022-04-01 2:52 ` [PR PATCH] [Updated] " subnut
` (3 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: subnut @ 2022-04-01 2:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/36158#issuecomment-1085355568
Comment:
@the-eater Is it okay if I take over maintainership of this package?
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] musikcube: update to 0.97.0 and enable new features
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
` (11 preceding siblings ...)
2022-04-01 2:46 ` subnut
@ 2022-04-01 2:52 ` subnut
2022-04-01 10:24 ` the-eater
` (2 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: subnut @ 2022-04-01 2:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages musikcube
https://github.com/void-linux/void-packages/pull/36158
musikcube: update to 0.97.0 and enable new features
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Summary
- Update to 0.97.0
- Added MPRIS support
- Moved openmpt plugin to a separate package `musikcube-openmpt`
#### Testing the changes
- I tested the changes in this PR: **YES** (it works properly)
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
<!--
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36158.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musikcube-36158.patch --]
[-- Type: text/x-diff, Size: 6718 bytes --]
From c9c27a928cde9ea2fa0b6fc5c8c2f03e96faf77c Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH] musikcube: update to 0.97.0, adopt
- Added patch to fix MPRIS support detection
- Moved openmpt plugin to a separate package `musikcube-openmpt`
---
srcpkgs/musikcube-openmpt | 1 +
.../patches/fix-install-locations.patch | 26 ++++++++---------
.../patches/fix-mpris-detection.patch | 25 ++++++++++++++++
srcpkgs/musikcube/template | 29 ++++++++++++-------
4 files changed, 57 insertions(+), 24 deletions(-)
create mode 120000 srcpkgs/musikcube-openmpt
create mode 100644 srcpkgs/musikcube/patches/fix-mpris-detection.patch
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/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/patches/fix-mpris-detection.patch b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
new file mode 100644
index 000000000000..dc7035d06693
--- /dev/null
+++ b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
@@ -0,0 +1,25 @@
+In Void linux, elogind provides libsystemd
+
+diff --git a/.cmake/AddOsSpecificPlugins.cmake b/.cmake/AddOsSpecificPlugins.cmake
+index ce0eea9b..5b067671 100644
+--- a/.cmake/AddOsSpecificPlugins.cmake
++++ b/.cmake/AddOsSpecificPlugins.cmake
+@@ -6,7 +6,7 @@ endif()
+
+ # systemd / MPRIS detection
+ if (NOT ENABLE_MPRIS MATCHES "false")
+- find_library(LIB_SYSTEMD NAMES systemd)
++ find_library(LIB_SYSTEMD NAMES elogind)
+ if (NOT LIB_SYSTEMD MATCHES "LIB_SYSTEMD-NOTFOUND")
+ message(STATUS "[mpris] systemd found at " ${LIB_SYSTEMD})
+ message(STATUS "[mpris] setting ENABLE_MPRIS=true")
+diff --git a/src/plugins/mpris/CMakeLists.txt b/src/plugins/mpris/CMakeLists.txt
+index fdee62d2..7a941d08 100644
+--- a/src/plugins/mpris/CMakeLists.txt
++++ b/src/plugins/mpris/CMakeLists.txt
+@@ -6,4 +6,4 @@ find_package(PkgConfig)
+ pkg_check_modules (SYSTEMD REQUIRED libsystemd)
+
+ add_library(mpris SHARED ${mpris_SOURCES})
+-target_link_libraries(mpris systemd)
++target_link_libraries(mpris elogind)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index d8d4e73d6b4b..fe89b2731f17 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,25 +10,24 @@ 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 libopenmpt-devel
+ $(vopt_if elogind elogind-devel)"
short_desc="Terminal-based music player in c++"
-maintainer="eater <=@eater.me>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="BSD-3-Clause"
homepage="https://musikcube.com/"
distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
-checksum=91fd984e68b6ef66f1be1ecdf0c84607453ec6ec80632ece688ac745c7719ea5
+checksum=ab170c5100251fcd6c8fd3c32eea45e9854c6c6272c6b0970bffbfc55d0b2ec5
+build_options="elogind"
+build_options_default="elogind"
+desc_option_elogind="Support MPRIS interface via elogind"
+
+export CMAKE_GENERATOR="Unix Makefiles"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
- configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-latomic'"
fi
-export CMAKE_GENERATOR="Unix Makefiles"
-
-#XXX: Otherwise xbps-install ffmpeg-devel will complain about unresolving shlibs
-# SDL2-2.0.10_3: broken, unresolvable shlib 'libGL.so.1'
-makedepends+=" libglvnd"
-
post_install() {
vlicense LICENSE.txt
}
@@ -56,3 +55,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
+ }
+}
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: musikcube: update to 0.97.0 and enable new features
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
` (12 preceding siblings ...)
2022-04-01 2:52 ` [PR PATCH] [Updated] " subnut
@ 2022-04-01 10:24 ` the-eater
2022-04-01 12:38 ` [PR PATCH] [Updated] " subnut
2022-04-07 17:22 ` [PR PATCH] [Merged]: musikcube: update to 0.97.0, adopt leahneukirchen
15 siblings, 0 replies; 17+ messages in thread
From: the-eater @ 2022-04-01 10:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
New comment by the-eater on void-packages repository
https://github.com/void-linux/void-packages/pull/36158#issuecomment-1085725420
Comment:
fine with me :)
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] musikcube: update to 0.97.0 and enable new features
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
` (13 preceding siblings ...)
2022-04-01 10:24 ` the-eater
@ 2022-04-01 12:38 ` subnut
2022-04-07 17:22 ` [PR PATCH] [Merged]: musikcube: update to 0.97.0, adopt leahneukirchen
15 siblings, 0 replies; 17+ messages in thread
From: subnut @ 2022-04-01 12:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1403 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages musikcube
https://github.com/void-linux/void-packages/pull/36158
musikcube: update to 0.97.0 and enable new features
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Summary
- Update to 0.97.0
- Added MPRIS support
- Moved openmpt plugin to a separate package `musikcube-openmpt`
#### Testing the changes
- I tested the changes in this PR: **YES** (it works properly)
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
<!--
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36158.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musikcube-36158.patch --]
[-- Type: text/x-diff, Size: 7606 bytes --]
From d35f39f32c1d4790b9e1c057e2c380a6268fd3ea Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH] musikcube: update to 0.97.0, adopt
- Added patch to fix MPRIS support detection
- Moved openmpt plugin to a separate package `musikcube-openmpt`
---
srcpkgs/musikcube-openmpt | 1 +
.../patches/fix-install-locations.patch | 26 ++++++-------
.../patches/fix-mpris-detection.patch | 25 ++++++++++++
srcpkgs/musikcube/template | 39 +++++++++++--------
4 files changed, 62 insertions(+), 29 deletions(-)
create mode 120000 srcpkgs/musikcube-openmpt
create mode 100644 srcpkgs/musikcube/patches/fix-mpris-detection.patch
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/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/patches/fix-mpris-detection.patch b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
new file mode 100644
index 000000000000..dc7035d06693
--- /dev/null
+++ b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
@@ -0,0 +1,25 @@
+In Void linux, elogind provides libsystemd
+
+diff --git a/.cmake/AddOsSpecificPlugins.cmake b/.cmake/AddOsSpecificPlugins.cmake
+index ce0eea9b..5b067671 100644
+--- a/.cmake/AddOsSpecificPlugins.cmake
++++ b/.cmake/AddOsSpecificPlugins.cmake
+@@ -6,7 +6,7 @@ endif()
+
+ # systemd / MPRIS detection
+ if (NOT ENABLE_MPRIS MATCHES "false")
+- find_library(LIB_SYSTEMD NAMES systemd)
++ find_library(LIB_SYSTEMD NAMES elogind)
+ if (NOT LIB_SYSTEMD MATCHES "LIB_SYSTEMD-NOTFOUND")
+ message(STATUS "[mpris] systemd found at " ${LIB_SYSTEMD})
+ message(STATUS "[mpris] setting ENABLE_MPRIS=true")
+diff --git a/src/plugins/mpris/CMakeLists.txt b/src/plugins/mpris/CMakeLists.txt
+index fdee62d2..7a941d08 100644
+--- a/src/plugins/mpris/CMakeLists.txt
++++ b/src/plugins/mpris/CMakeLists.txt
+@@ -6,4 +6,4 @@ find_package(PkgConfig)
+ pkg_check_modules (SYSTEMD REQUIRED libsystemd)
+
+ add_library(mpris SHARED ${mpris_SOURCES})
+-target_link_libraries(mpris systemd)
++target_link_libraries(mpris elogind)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index d8d4e73d6b4b..01afa616123a 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,40 +1,39 @@
# Template file for 'musikcube'
pkgname=musikcube
-version=0.96.10
+version=0.97.0
revision=1
build_style=cmake
make_cmd=make
-configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true
- -DENABLE_PIPEWIRE=true -DENABLE_BUNDLED_TAGLIB=false"
+configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DENABLE_PIPEWIRE=true
+ -DENABLE_BUNDLED_TAGLIB=false"
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 libopenmpt-devel
+ $(vopt_if elogind elogind-devel)"
short_desc="Terminal-based music player in c++"
-maintainer="eater <=@eater.me>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="BSD-3-Clause"
homepage="https://musikcube.com/"
distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
-checksum=91fd984e68b6ef66f1be1ecdf0c84607453ec6ec80632ece688ac745c7719ea5
+checksum=ab170c5100251fcd6c8fd3c32eea45e9854c6c6272c6b0970bffbfc55d0b2ec5
+build_options="elogind"
+desc_option_elogind="Support MPRIS interface via elogind"
+build_options_default="elogind"
+
+export CMAKE_GENERATOR="Unix Makefiles"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
- configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-latomic'"
fi
-export CMAKE_GENERATOR="Unix Makefiles"
-
-#XXX: Otherwise xbps-install ffmpeg-devel will complain about unresolving shlibs
-# SDL2-2.0.10_3: broken, unresolvable shlib 'libGL.so.1'
-makedepends+=" libglvnd"
-
post_install() {
vlicense LICENSE.txt
}
musikcube-devel_package() {
- depends="musikcube-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -42,7 +41,7 @@ musikcube-devel_package() {
}
musikcube-sndio_package() {
- depends="musikcube>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - sndio output plugin"
pkg_install() {
vmove usr/lib/musikcube/plugins/libsndioout.so
@@ -50,9 +49,17 @@ musikcube-sndio_package() {
}
musikcube-pipewire_package() {
- depends="musikcube>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - pipewire output plugin"
pkg_install() {
vmove usr/lib/musikcube/plugins/libpipewireout.so
}
}
+
+musikcube-openmpt_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - openmpt decoder plugin"
+ pkg_install() {
+ vmove usr/lib/musikcube/plugins/libopenmptdecoder.so
+ }
+}
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Merged]: musikcube: update to 0.97.0, adopt
2022-03-15 17:03 [PR PATCH] musikcube: update to 0.97.0 subnut
` (14 preceding siblings ...)
2022-04-01 12:38 ` [PR PATCH] [Updated] " subnut
@ 2022-04-07 17:22 ` leahneukirchen
15 siblings, 0 replies; 17+ messages in thread
From: leahneukirchen @ 2022-04-07 17:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]
There's a merged pull request on the void-packages repository
musikcube: update to 0.97.0, adopt
https://github.com/void-linux/void-packages/pull/36158
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Summary
- Update to 0.97.0
- Added MPRIS support
- Moved openmpt plugin to a separate package `musikcube-openmpt`
#### Testing the changes
- I tested the changes in this PR: **YES** (it works properly)
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
<!--
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 17+ messages in thread