musikcube: update to 0.90.0

srcpkgs/musikcube/patches/fix-install-locations.patch

@@ -1,61 +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 f865a110..e9536178 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -181,7 +181,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-   install(FILES ${plugins} DESTINATION share/musikcube/plugins)
- else ()
-   file(GLOB plugins "bin/plugins/*.so")
--  install(FILES ${plugins} DESTINATION share/musikcube/plugins)
-+  install(FILES ${plugins} DESTINATION lib/musikcube/plugins)
- endif ()
- 
- file(GLOB sdk_headers "src/core/sdk/*.h")
-@@ -199,20 +199,12 @@ install(FILES ${locales} DESTINATION share/musikcube/locales)
- if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-   install(FILES "bin/libmusikcore.dylib" DESTINATION share/musikcube)
- else ()
--  install(FILES "bin/libmusikcore.so" DESTINATION share/musikcube)
-+  install(FILES "bin/libmusikcore.so" DESTINATION lib/)
- endif ()
- 
- # executable and shell script for musikcube
- install(
-   FILES bin/musikcube
--  DESTINATION share/musikcube
--  PERMISSIONS
--    OWNER_EXECUTE OWNER_READ OWNER_WRITE
--    GROUP_EXECUTE GROUP_READ GROUP_WRITE
--    WORLD_EXECUTE WORLD_READ)
--
--install(
--  FILES "${CMAKE_CURRENT_BINARY_DIR}/src/musikcube/musikcube"
-   DESTINATION bin/
-   PERMISSIONS
-     OWNER_EXECUTE OWNER_READ OWNER_WRITE
-@@ -222,14 +214,6 @@ install(
- # executable and shell script for daemon
- install(
-   FILES bin/musikcubed
--  DESTINATION share/musikcube
--  PERMISSIONS
--    OWNER_EXECUTE OWNER_READ OWNER_WRITE
--    GROUP_EXECUTE GROUP_READ GROUP_WRITE
--    WORLD_EXECUTE WORLD_READ)
--
--install(
--  FILES "${CMAKE_CURRENT_BINARY_DIR}/src/musikcubed/musikcubed"
-   DESTINATION bin/
-   PERMISSIONS
-     OWNER_EXECUTE OWNER_READ OWNER_WRITE
 diff --git src/core/support/Common.cpp src/core/support/Common.cpp
-index 43e7a3ed..0ee3c8c0 100644
+index f31cde146f..bad24a40b4 100644
 --- src/core/support/Common.cpp
 +++ src/core/support/Common.cpp
-@@ -80,49 +80,11 @@ static inline void silentDelete(const std::string fn) {
+@@ -102,65 +102,11 @@ static inline void silentDelete(const std::string fn) {
  namespace musik { namespace core {
  
      std::string GetPluginDirectory() {
@@ -92,6 +42,22 @@ index 43e7a3ed..0ee3c8c0 100644
 -                mib[3] = -1;
 -                size_t bufsize = sizeof(pathbuf);
 -                sysctl(mib, 4, pathbuf, &bufsize, nullptr, 0);
+-            #elif defined  __OpenBSD__
+-			    int mib[4];
+-			    char **argv;
+-			    size_t len = ARG_MAX;
+-
+-			    mib[0] = CTL_KERN;
+-			    mib[1] = KERN_PROC_ARGS;
+-			    mib[2] = getpid();
+-			    mib[3] = KERN_PROC_ARGV;
+-
+-			    argv = new char*[len];
+-			    if (sysctl(mib, 4, argv, &len, nullptr, 0) < 0) abort();
+-
+-			    boost::filesystem::path command = boost::filesystem::system_complete(argv[0]);
+-			    realpath(command.c_str(), pathbuf);
+-			    delete[] argv;
 -            #else
 -                std::string pathToProc = u8fmt("/proc/%d/exe", (int) getpid());
 -                readlink(pathToProc.c_str(), pathbuf, PATH_MAX);
@@ -103,7 +69,57 @@ index 43e7a3ed..0ee3c8c0 100644
 -        #endif
 -
 -        return result;
-+        return std::string("/usr/share/musikcube");
++	return std::string("/usr/share/musikcube");
      }
  
      std::string GetHomeDirectory() {
+diff --git CMakeLists.txt CMakeLists.txt
+index 3850e4050f..063e09f718 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -223,7 +223,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+   install(FILES ${plugins} DESTINATION share/musikcube/plugins)
+ else ()
+   file(GLOB plugins "bin/plugins/*.so")
+-  install(FILES ${plugins} DESTINATION share/musikcube/plugins)
++  install(FILES ${plugins} DESTINATION lib/musikcube/plugins)
+ endif ()
+ 
+ file(GLOB sdk_headers "src/core/sdk/*.h")
+@@ -257,20 +257,12 @@ endif()
+ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+   install(FILES "bin/libmusikcore.dylib" DESTINATION share/musikcube)
+ else()
+-  install(FILES "bin/libmusikcore.so" DESTINATION share/musikcube)
++  install(FILES "bin/libmusikcore.so" DESTINATION lib/)
+ endif()
+ 
+ # executable and shell script for musikcube
+ install(
+   FILES bin/musikcube
+-  DESTINATION share/musikcube
+-  PERMISSIONS
+-    OWNER_EXECUTE OWNER_READ OWNER_WRITE
+-    GROUP_EXECUTE GROUP_READ GROUP_WRITE
+-    WORLD_EXECUTE WORLD_READ)
+-
+-install(
+-  FILES "${CMAKE_CURRENT_BINARY_DIR}/src/musikcube/musikcube"
+   DESTINATION bin/
+   PERMISSIONS
+     OWNER_EXECUTE OWNER_READ OWNER_WRITE
+@@ -280,14 +272,6 @@ install(
+ # executable and shell script for daemon
+ install(
+   FILES bin/musikcubed
+-  DESTINATION share/musikcube
+-  PERMISSIONS
+-    OWNER_EXECUTE OWNER_READ OWNER_WRITE
+-    GROUP_EXECUTE GROUP_READ GROUP_WRITE
+-    WORLD_EXECUTE WORLD_READ)
+-
+-install(
+-  FILES "${CMAKE_CURRENT_BINARY_DIR}/src/musikcubed/musikcubed"
+   DESTINATION bin/
+   PERMISSIONS
+     OWNER_EXECUTE OWNER_READ OWNER_WRITE

srcpkgs/musikcube/patches/no-strip.patch

@@ -1,16 +1,17 @@
 Musikcube does some stripping which breaks with a custom build directory,
 also not necessary as we do stripping ourselves
 
-diff --git CMakeLists.txt CMakeLists.txt.2
+diff --git CMakeLists.txt CMakeLists.txt
-index 2dbd1f6e99..35405944b1 100644
+index 063e09f718..0d3fe883e9 100644
 --- CMakeLists.txt
-+++ CMakeLists.txt.2
++++ CMakeLists.txt
-@@ -322,8 +322,3 @@ endif()
+@@ -354,9 +354,3 @@ endif()
+ # they don't yet exist!
  add_custom_target(postbuild ALL DEPENDS musikcube musikcubed)
  add_custom_command(TARGET postbuild POST_BUILD COMMAND cmake .)
- 
+-
 -# strip binaries in release mode
 -if (CMAKE_BUILD_TYPE MATCHES Release)
 -  message(STATUS "stripping binaries...")
--  add_custom_command(TARGET postbuild POST_BUILD COMMAND ./strip-nix.sh)
+-  add_custom_command(TARGET postbuild POST_BUILD COMMAND "${CMAKE_SOURCE_DIR}/strip-nix.sh")
 -endif()

srcpkgs/musikcube/template

@@ -1,9 +1,10 @@
 # Template file for 'musikcube'
 pkgname=musikcube
-version=0.83.0
+version=0.90.0
-revision=2
+revision=1
 build_style=cmake
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true"
+hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
  libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
@@ -13,7 +14,7 @@ maintainer="eater <=@eater.me>"
 license="BSD-3-Clause"
 homepage="https://musikcube.com/"
 distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
-checksum=7841db0358d691fed768d10a7cbb2bfaace85c2a744ad59a65ce581ca972a426
+checksum=e55e4ea8f84f92f18a572d1e12a8f68d88228b04324507e49d833b21e042f5bf
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"