Merge 75b9269a69 into 776a0411c2

srcpkgs/muse/patches/cross.patch

@@ -0,0 +1,13 @@
+diff -rup src/CMakeLists.txt.orig src/CMakeLists.txt
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -542,7 +542,7 @@ SET (AEFFECT_H_FOUND FALSE)
+ SET (VST_NATIVE_SUPPORT FALSE)
+ 
+ if (ENABLE_VST_NATIVE)
+-      find_file(VST_HEADER_CHECK aeffectx.h PATHS ${VST_HEADER_PATH} NO_DEFAULT_PATH)
++      find_file(VST_HEADER_CHECK aeffectx.h PATHS ${VST_HEADER_PATH} NO_DEFAULT_PATH CMAKE_FIND_ROOT_PATH_BOTH)
+       if (VST_HEADER_CHECK STREQUAL "VST_HEADER_CHECK-NOTFOUND")
+         message("Native VST support disabled")
+       else (VST_HEADER_CHECK STREQUAL "VST_HEADER_CHECK-NOTFOUND")
+

srcpkgs/muse/patches/i686.patch

@@ -1,22 +0,0 @@
-From 40afa0ad60e221c7b02fb8febbf9baff42c13cdc Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Mon, 25 Apr 2022 10:19:30 +0200
-Subject: [PATCH] Fix intptr_t was not declared in this scope on i386
-
----
- src/al/dsp.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/al/dsp.cpp b/src/al/dsp.cpp
-index 8a4803e4c..3f601dc63 100644
---- a/src/al/dsp.cpp
-+++ b/src/al/dsp.cpp
-@@ -21,7 +21,7 @@
- //=============================================================================
- 
- #include <stdio.h>
--//#include <stdint.h>
-+#include <stdint.h>
- //#include "config.h"
- #include "al.h"
- #include "dsp.h"

srcpkgs/muse/template

@@ -1,14 +1,14 @@
 # Template file for 'muse'
 pkgname=muse
-version=4.1.0
+version=4.2.1
-revision=5
+revision=1
 build_wrksrc=src
 build_style=cmake
-build_helper=qmake
+build_helper="qmake qemu"
-configure_args="-DENABLE_RTAUDIO=OFF -DLIB_INSTALL_DIR=/usr/lib
+configure_args="-DLIB_INSTALL_DIR=/usr/lib
  $(vopt_bool alsa ENABLE_ALSA) $(vopt_bool python ENABLE_PYTHON)"
-hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake extra-cmake-modules"
-makedepends="$(vopt_if alsa alsa-lib-devel) dssi-devel fluidsynth-devel
+makedepends="$(vopt_if alsa alsa-lib-devel) rtaudio-devel dssi-devel fluidsynth-devel
  jack-devel ladspa-sdk libinstpatch-devel liblo-devel liblrdf-devel libsamplerate-devel
  libsndfile-devel lilv-devel lv2 rubberband-devel qt5-svg-devel qt5-tools-devel
  $(vopt_if python python3-devel)"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://muse-sequencer.github.io"
 distfiles="https://github.com/muse-sequencer/muse/archive/${version/pre/-pre}.tar.gz"
-checksum=b5462cdebd84326b0ffc0aa0b2c27f5eab55362dcc04e17796de866fcee4f391
+checksum=c9b87d9cdacf280cc1eaefcf05e26e4c2f38dea969823fd8fb7e417f2e7647cf
 python_version=3
 
 build_options="alsa python"