musikcube: update to 0.62.0.
Enable sndio output plugin
This commit is contained in:
parent
3f4ffff073
commit
a102531d34
4 changed files with 27 additions and 47 deletions
|
@ -2,10 +2,10 @@ Currently all ELF files (binaries and libraries), get installed to /usr/share/mu
|
||||||
This patch moves all those files to their normal locations and fixes the code to expect that
|
This patch moves all those files to their normal locations and fixes the code to expect that
|
||||||
|
|
||||||
diff --git CMakeLists.txt CMakeLists.txt
|
diff --git CMakeLists.txt CMakeLists.txt
|
||||||
index 8c2826e6..9d56b984 100644
|
index f865a110..e9536178 100644
|
||||||
--- CMakeLists.txt
|
--- CMakeLists.txt
|
||||||
+++ CMakeLists.txt
|
+++ CMakeLists.txt
|
||||||
@@ -179,7 +179,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
@@ -181,7 +181,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
||||||
install(FILES ${plugins} DESTINATION share/musikcube/plugins)
|
install(FILES ${plugins} DESTINATION share/musikcube/plugins)
|
||||||
else ()
|
else ()
|
||||||
file(GLOB plugins "bin/plugins/*.so")
|
file(GLOB plugins "bin/plugins/*.so")
|
||||||
|
@ -14,7 +14,7 @@ index 8c2826e6..9d56b984 100644
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
file(GLOB sdk_headers "src/core/sdk/*.h")
|
file(GLOB sdk_headers "src/core/sdk/*.h")
|
||||||
@@ -197,20 +197,12 @@ install(FILES ${locales} DESTINATION share/musikcube/locales)
|
@@ -199,20 +199,12 @@ install(FILES ${locales} DESTINATION share/musikcube/locales)
|
||||||
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
||||||
install(FILES "bin/libmusikcore.dylib" DESTINATION share/musikcube)
|
install(FILES "bin/libmusikcore.dylib" DESTINATION share/musikcube)
|
||||||
else ()
|
else ()
|
||||||
|
@ -36,7 +36,7 @@ index 8c2826e6..9d56b984 100644
|
||||||
DESTINATION bin/
|
DESTINATION bin/
|
||||||
PERMISSIONS
|
PERMISSIONS
|
||||||
OWNER_EXECUTE OWNER_READ OWNER_WRITE
|
OWNER_EXECUTE OWNER_READ OWNER_WRITE
|
||||||
@@ -220,14 +212,6 @@ install(
|
@@ -222,14 +214,6 @@ install(
|
||||||
# executable and shell script for daemon
|
# executable and shell script for daemon
|
||||||
install(
|
install(
|
||||||
FILES bin/musikcubed
|
FILES bin/musikcubed
|
||||||
|
@ -52,17 +52,17 @@ index 8c2826e6..9d56b984 100644
|
||||||
PERMISSIONS
|
PERMISSIONS
|
||||||
OWNER_EXECUTE OWNER_READ OWNER_WRITE
|
OWNER_EXECUTE OWNER_READ OWNER_WRITE
|
||||||
diff --git src/core/support/Common.cpp src/core/support/Common.cpp
|
diff --git src/core/support/Common.cpp src/core/support/Common.cpp
|
||||||
index 9580c2aa..694876e7 100644
|
index 43e7a3ed..0ee3c8c0 100644
|
||||||
--- src/core/support/Common.cpp
|
--- src/core/support/Common.cpp
|
||||||
+++ src/core/support/Common.cpp
|
+++ src/core/support/Common.cpp
|
||||||
@@ -82,49 +82,11 @@ static inline void silentDelete(const std::string fn) {
|
@@ -80,49 +80,11 @@ static inline void silentDelete(const std::string fn) {
|
||||||
namespace musik { namespace core {
|
namespace musik { namespace core {
|
||||||
|
|
||||||
std::string GetPluginDirectory() {
|
std::string GetPluginDirectory() {
|
||||||
- std::string path(GetApplicationDirectory());
|
- std::string path(GetApplicationDirectory());
|
||||||
- path.append("/plugins/");
|
- path.append("/plugins/");
|
||||||
- return path;
|
- return path;
|
||||||
+ return std::string("/usr/lib/musikcube/plugins");
|
+ return std::string("/usr/lib/musikcube/plugins");
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string GetApplicationDirectory() {
|
std::string GetApplicationDirectory() {
|
||||||
|
@ -93,7 +93,7 @@ index 9580c2aa..694876e7 100644
|
||||||
- size_t bufsize = sizeof(pathbuf);
|
- size_t bufsize = sizeof(pathbuf);
|
||||||
- sysctl(mib, 4, pathbuf, &bufsize, nullptr, 0);
|
- sysctl(mib, 4, pathbuf, &bufsize, nullptr, 0);
|
||||||
- #else
|
- #else
|
||||||
- std::string pathToProc = boost::str(boost::format("/proc/%d/exe") % (int) getpid());
|
- std::string pathToProc = u8fmt("/proc/%d/exe", (int) getpid());
|
||||||
- readlink(pathToProc.c_str(), pathbuf, PATH_MAX);
|
- readlink(pathToProc.c_str(), pathbuf, PATH_MAX);
|
||||||
- #endif
|
- #endif
|
||||||
-
|
-
|
||||||
|
@ -103,7 +103,7 @@ index 9580c2aa..694876e7 100644
|
||||||
- #endif
|
- #endif
|
||||||
-
|
-
|
||||||
- return result;
|
- return result;
|
||||||
+ return std::string("/usr/share/musikcube");
|
+ return std::string("/usr/share/musikcube");
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string GetHomeDirectory() {
|
std::string GetHomeDirectory() {
|
||||||
|
|
|
@ -1,33 +0,0 @@
|
||||||
From 3fb2c0658ab3d3ab7a92587dac426b057433fcf8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: eater <=@eater.me>
|
|
||||||
Date: Sun, 20 Jan 2019 15:21:59 +0100
|
|
||||||
Subject: [PATCH] Fix: let libc set length of resolved in realpath
|
|
||||||
|
|
||||||
---
|
|
||||||
src/plugins/gmedecoder/Constants.h | 8 +++++++-
|
|
||||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git src/plugins/gmedecoder/Constants.h src/plugins/gmedecoder/Constants.h
|
|
||||||
index bcd887c7..62ef2e00 100644
|
|
||||||
--- src/plugins/gmedecoder/Constants.h
|
|
||||||
+++ src/plugins/gmedecoder/Constants.h
|
|
||||||
@@ -221,6 +221,12 @@ static inline std::string canonicalizePath(const std::string& path) {
|
|
||||||
delete[] dest;
|
|
||||||
}
|
|
||||||
return result8;
|
|
||||||
+#elif __gnu_linux__
|
|
||||||
+ char* realname = realpath(path.c_str(), NULL);
|
|
||||||
+ if (!realname) {
|
|
||||||
+ return "";
|
|
||||||
+ }
|
|
||||||
+ return std::string(realname);
|
|
||||||
#else
|
|
||||||
char realname[_POSIX_PATH_MAX];
|
|
||||||
if (realpath(path.c_str(), realname) == 0) {
|
|
||||||
@@ -228,4 +234,4 @@ static inline std::string canonicalizePath(const std::string& path) {
|
|
||||||
}
|
|
||||||
return std::string(realname);
|
|
||||||
#endif
|
|
||||||
-}
|
|
||||||
\ No newline at end of file
|
|
||||||
+}
|
|
12
srcpkgs/musikcube/patches/fix-sndio.patch
Normal file
12
srcpkgs/musikcube/patches/fix-sndio.patch
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git src/plugins/sndioout/SndioOut.cpp src/plugins/sndioout/SndioOut.cpp
|
||||||
|
index b0a038e1..82aef7ec 100644
|
||||||
|
--- src/plugins/sndioout/SndioOut.cpp
|
||||||
|
+++ src/plugins/sndioout/SndioOut.cpp
|
||||||
|
@@ -39,6 +39,7 @@
|
||||||
|
#include <math.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <iostream>
|
||||||
|
+#include <functional>
|
||||||
|
|
||||||
|
#define BUFFER_COUNT 16
|
||||||
|
#define ERROR(str) std::cerr << "SndioOut Error: " << str << "\n";
|
|
@ -1,18 +1,19 @@
|
||||||
# Template file for 'musikcube'
|
# Template file for 'musikcube'
|
||||||
pkgname=musikcube
|
pkgname=musikcube
|
||||||
version=0.61.0
|
version=0.62.0
|
||||||
revision=2
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DNO_NCURSESW=1"
|
configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true"
|
||||||
makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
|
makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
|
||||||
libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
|
libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
|
||||||
libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel"
|
libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
|
||||||
|
sndio-devel"
|
||||||
short_desc="Terminal-based music player in c++"
|
short_desc="Terminal-based music player in c++"
|
||||||
maintainer="eater <=@eater.me>"
|
maintainer="eater <=@eater.me>"
|
||||||
license="BSD-3-Clause"
|
license="BSD-3-Clause"
|
||||||
homepage="https://musikcube.com/"
|
homepage="https://musikcube.com/"
|
||||||
distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
|
distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
|
||||||
checksum=6042ee35897fed16a30b00afc6a62b0d5b9b77d3526dab648599755231916aaf
|
checksum=4707d80813e92ce131cd3cb8bb5d58fc69e84233a0906e89a19298088f3a38ad
|
||||||
|
|
||||||
case "${XBPS_TARGET_MACHINE}" in
|
case "${XBPS_TARGET_MACHINE}" in
|
||||||
armv[56]*)
|
armv[56]*)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue