musikcube: update to 0.96.6

srcpkgs/musikcube-pipewire

@@ -0,0 +1 @@
+musikcube

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

@@ -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
 
 diff --git CMakeLists.txt CMakeLists.txt
-index 7e0ea437..896d45d4 100644
+index d685695f..5ac43f1f 100644
 --- CMakeLists.txt
 +++ CMakeLists.txt
-@@ -193,7 +193,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+@@ -208,7 +208,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
    install(FILES ${plugins} DESTINATION share/musikcube/plugins)
  else ()
    file(GLOB plugins "bin/plugins/*.so")
@@ -14,7 +14,7 @@ index 7e0ea437..896d45d4 100644
  endif ()
  
  file(GLOB sdk_headers "src/musikcore/sdk/*.h")
-@@ -228,20 +228,12 @@ endif()
+@@ -237,20 +237,12 @@ endif()
  if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
    install(FILES "bin/libmusikcore.dylib" DESTINATION share/musikcube)
  else()
@@ -36,7 +36,7 @@ index 7e0ea437..896d45d4 100644
    DESTINATION bin/
    PERMISSIONS
      OWNER_EXECUTE OWNER_READ OWNER_WRITE
-@@ -251,14 +243,6 @@ install(
+@@ -260,14 +252,6 @@ install(
  # executable and shell script for daemon
  install(
    FILES bin/musikcubed
@@ -52,17 +52,17 @@ index 7e0ea437..896d45d4 100644
    PERMISSIONS
      OWNER_EXECUTE OWNER_READ OWNER_WRITE
 diff --git src/musikcore/support/Common.cpp src/musikcore/support/Common.cpp
-index 9e327b63..08f49351 100644
+index 58bc4d2f..1670c2f7 100644
 --- src/musikcore/support/Common.cpp
 +++ src/musikcore/support/Common.cpp
-@@ -86,64 +86,11 @@ namespace musik { namespace core {
+@@ -90,65 +90,11 @@ namespace musik { namespace core {
      }
  
      std::string GetPluginDirectory() {
 -        std::string path(GetApplicationDirectory());
 -        path.append("/plugins/");
 -        return path;
-+      return std::string("/usr/lib/musikcube/plugins");
++        return std::string("/usr/lib/musikcube/plugins");
      }
  
      std::string GetApplicationDirectory() {
@@ -111,14 +111,15 @@ index 9e327b63..08f49351 100644
 -            #else
 -                std::string pathToProc = u8fmt("/proc/%d/exe", (int) getpid());
 -                readlink(pathToProc.c_str(), pathbuf, PATH_MAX);
--        #endif
+-            #endif
+-
 -            result.assign(pathbuf);
 -            size_t last = result.find_last_of("/");
 -            result = result.substr(0, last); /* remove filename component */
 -        #endif
 -
 -        return result;
-+      return std::string("/usr/share/musikcube");
++        return std::string("/usr/share/musikcube");
      }
  
      std::string GetHomeDirectory() {

srcpkgs/musikcube/patches/use-pkg-config-for-pipewire.patch

@@ -0,0 +1,18 @@
+diff --git src/plugins/pipewireout/CMakeLists.txt src/plugins/pipewireout/CMakeLists.txt
+index 7c24320d..233adab2 100644
+--- src/plugins/pipewireout/CMakeLists.txt
++++ src/plugins/pipewireout/CMakeLists.txt
+@@ -7,10 +7,8 @@ ensure_library_exists(pipewire-0.3)
+ 
+ message(STATUS "[pipewireout] plugin enabled")
+ 
+-include_directories("/usr/include/spa-0.2")
+-include_directories("/usr/local/include/spa-0.2")
+-include_directories("/usr/include/pipewire-0.3")
+-include_directories("/usr/local/include/pipewire-0.3")
++find_package(PkgConfig)
++pkg_check_modules(PIPEWIRE REQUIRED IMPORTED_TARGET libpipewire-0.3)
+ 
+ add_library(pipewireout SHARED ${pipewireout_SOURCES})
+-target_link_libraries(pipewireout ${musikcube_LINK_LIBS} pipewire-0.3)
++target_link_libraries(pipewireout ${musikcube_LINK_LIBS} PkgConfig::PIPEWIRE)

srcpkgs/musikcube/template

@@ -1,21 +1,22 @@
 # Template file for 'musikcube'
 pkgname=musikcube
-version=0.96.4
+version=0.96.6
 revision=1
 build_style=cmake
 make_cmd=make
-configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
+configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=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"
+ sndio-devel pipewire-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=c184fe12a62da15f6dfabab885a991f5ad49065fcc7e1bef2b2892b15ed7bb99
+checksum=3d3512ae03ff5a233de8d6787417b32731e50d813035fd49188b2fca66c6d21e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -28,10 +29,6 @@ export CMAKE_GENERATOR="Unix Makefiles"
 # SDL2-2.0.10_3: broken, unresolvable shlib 'libGL.so.1'
 makedepends+=" libglvnd"
 
-post_patch() {
-	vsed -i -e 's/00097000/00097001/' src/plugins/server/HttpServer.h
-}
-
 post_install() {
 	vlicense LICENSE.txt
 }
@@ -45,9 +42,17 @@ musikcube-devel_package() {
 }
 
 musikcube-sndio_package() {
-	depends="musikcube-${version}_${revision}"
+	depends="musikcube>=${version}_${revision}"
 	short_desc+=" - sndio output plugin"
 	pkg_install() {
 		vmove usr/lib/musikcube/plugins/libsndioout.so
 	}
 }
+
+musikcube-pipewire_package() {
+	depends="musikcube>=${version}_${revision}"
+	short_desc+=" - pipewire output plugin"
+	pkg_install() {
+		vmove usr/lib/musikcube/plugins/libpipewireout.so
+	}
+}