From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 4B4wMBhbnWRr3QAASxT56A (envelope-from ) for ; Thu, 29 Jun 2023 12:21:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id iHUjLxhbnWRDMwAAG6o9tA (envelope-from ) for ; Thu, 29 Jun 2023 12:21:12 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0386D382B0 for ; Thu, 29 Jun 2023 12:21:12 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEols-0004AX-Jf; Thu, 29 Jun 2023 06:21:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qEolq-00048B-DP for guix-patches@gnu.org; Thu, 29 Jun 2023 06:21:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qEolq-0006LA-50 for guix-patches@gnu.org; Thu, 29 Jun 2023 06:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qEolq-0003dc-05 for guix-patches@gnu.org; Thu, 29 Jun 2023 06:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63065] [PATCH v2 06/16] gnu: Add yabridge. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 29 Jun 2023 10:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63065 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "63065@debbugs.gnu.org" <63065@debbugs.gnu.org> Received: via spool by 63065-submit@debbugs.gnu.org id=B63065.168803404113929 (code B ref 63065); Thu, 29 Jun 2023 10:21:01 +0000 Received: (at 63065) by debbugs.gnu.org; 29 Jun 2023 10:20:41 +0000 Received: from localhost ([127.0.0.1]:52339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEolT-0003ca-T9 for submit@debbugs.gnu.org; Thu, 29 Jun 2023 06:20:40 -0400 Received: from mail-40141.protonmail.ch ([185.70.40.141]:33873) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEolQ-0003cK-JV for 63065@debbugs.gnu.org; Thu, 29 Jun 2023 06:20:37 -0400 Date: Thu, 29 Jun 2023 10:20:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1688034030; x=1688293230; bh=p7OPHlUJWdEGAgXFX2uIbfAF/1VD5HXROLjM3O+OnXQ=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=Kp1XsH6w5fVTmvB19QX9H6W9YmmG1vko8w5ApKoe7tRhwi4O/eus2m30MHO405IM9 P8hr6xSJZ/cFtkBxEE1utqahRJJOL/wlkwltHpP5Cg16OIAZqeUQdniek6yYwcM38g MhuZmgsCzpq1/+zHdXyDokL9M+ETpmVsbdTPoihWSWap5l9/2wBfcqSG2cT/RzqITq 36TClkan9JXFbpNeI/d5c7HKru5Iipb0v0bw5g3JzxzkSad2DFy5B0Di9pCFXf3q1d mVTzAmlslGlUZ1sZCspz2qwuf9A9iXVr7JK5wfH9jAp/S9CQ7Ikpp0G/g66wnj+E3j Vj2w7FpzNCphg== Message-ID: <-4-Qw03sW-iEY2AKTjeoPxFRmvMcn9wIBks9zO73havgvPA6UAihkK59CqWd_tjIBvZYlgjGqmIoAACNdCuutbvWZpA5mbzPS-0GjcY8PG0=@proton.me> Feedback-ID: 45211691:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches From: Sughosha via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1688034072; a=rsa-sha256; cv=none; b=s/S20GljcMqZpolOuAWRZNBjYAbfXAEBPl50AMY/FWVbu0HCHTOr/vT9PY9KxnmbURhzh+ W1wEw71SVPO5ezIvTV99knL/+epuxzmP+yiW8M3vXq8EC+iHsPGtLUImftjVAbx2IkpLFT 9MoCn5xH9XXxGAgQ7Zvwdjpr+L7c4583Io+8pRXdgax/ZQ1JNEWKFesitoXU5fjNhBaCu9 Ve2VYjvLzeAnJE2vxknhNPQOgiiTrBxO3Q3XGfX0zdTH/0MzQZPZ1lqqPmtYkU/FUMJQwK oZlQLIFMcsZLm+Xe4glhvwLG5dY0DfeokWFmTVX3hHCaCVlqnPqIOG6dknb66w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=proton.me header.s=protonmail header.b=Kp1XsH6w; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688034072; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=p7OPHlUJWdEGAgXFX2uIbfAF/1VD5HXROLjM3O+OnXQ=; b=f4MSgMfWHfVrKJ11zXDbZ9P5Vi9ttKiTXEz0Ob7E9HbDObf5mkmtieBjuJj75R5u9yvYVV t3QSfuLnkPhQSQ+ChYQcgdew1Q1TwiCWUuSzAP2NL/T6tlDcl0Wv0xovnUarkBhernouBC Iqa9GhgSk2AlOzxsYHPA5Ckk3G3/KLJfr4SFy4cA+b9XXhOSUAmPjLbKgrLn4rwMWQ1cVx qCPHM0bvsnw8YZvT8WtL0UtevfVth8DnCZUdVTA7WUksdnyhq+n1lA7LXC1GmVzDzycvLk QSVvIipoNAqrPuQNfIsu14i295whTApmgtSsmHXF6QMNXGKq1/eNTxiGXs6dcA== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=proton.me header.s=protonmail header.b=Kp1XsH6w; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -4.55 X-Spam-Score: -4.55 X-Migadu-Queue-Id: 0386D382B0 X-TUID: y7lL6+Aw6SL3 * gnu/packages/audio.scm (yabridge): New variable. * gnu/packages/patches/yabridge-5.0.4-fix-dependency-search.patch: New file. * gnu/packages/patches/vst3sdk-3.7.7-allow-winelib-compilation.patch: New file. * gnu/local.mk: Register the patch files. --- gnu/local.mk | 2 + gnu/packages/audio.scm | 127 ++++++++++++ ...3sdk-3.7.7-allow-winelib-compilation.patch | 191 ++++++++++++++++++ .../patches/yabridge-5.0.4-dependencies.patch | 36 ++++ 4 files changed, 356 insertions(+) create mode 100644 gnu/packages/patches/vst3sdk-3.7.7-allow-winelib-compil= ation.patch create mode 100644 gnu/packages/patches/yabridge-5.0.4-dependencies.patch diff --git a/gnu/local.mk b/gnu/local.mk index e65888a044..e05602c4e5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2054,6 +2054,7 @@ dist_patch_DATA =3D=09=09=09=09=09=09\ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch=09\ %D%/packages/patches/vsearch-unbundle-cityhash.patch=09=09\ + %D%/packages/patches/vst3sdk-3.7.7-allow-winelib-compilation.patch=09\ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch=09=09=09\ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch=09=09=09\ %D%/packages/patches/vtk-7-gcc-10-compat.patch=09=09\ @@ -2096,6 +2097,7 @@ dist_patch_DATA =3D=09=09=09=09=09=09\ %D%/packages/patches/xterm-370-explicit-xcursor.patch=09=09\ %D%/packages/patches/xygrib-fix-finding-data.patch=09=09\ %D%/packages/patches/xygrib-newer-proj.patch=09=09=09\ + %D%/packages/patches/yabridge-5.0.4-fix-dependency-search.patch=09\ %D%/packages/patches/yggdrasil-extra-config.patch=09\ %D%/packages/patches/zig-do-not-link-against-librt.patch=09\ %D%/packages/patches/zig-use-system-paths.patch=09=09\ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 0e7a3fa8a5..02d2a68396 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -71,7 +71,9 @@ (define-module (gnu packages audio) #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages curl) #:use-module (gnu packages dbm) #:use-module (gnu packages documentation) @@ -132,6 +134,7 @@ (define-module (gnu packages audio) #:use-module (gnu packages vim) ;xxd #:use-module (gnu packages web) #:use-module (gnu packages webkit) + #:use-module (gnu packages wine) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) @@ -5841,6 +5844,130 @@ (define-public mbelib (license (list license:bsd-3 ; test/ framework license:isc))))) ; the rest =20 +(define-public yabridge + (package + (name "yabridge") + (version "5.0.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/robbert-vdh/yabridge") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ayl706nv67jkixbrh9z7225gdwg2s4rzndx77761x33mk6by7a8")) + (patches + (search-patches + "yabridge-5.0.4-dependencies.patch")) + (modules '((guix build utils))))) + (build-system meson-build-system) + (arguments + (list #:configure-flags + #~(list (string-append "--cross-file=3D" #$source "/cross-wine.= conf")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'add-vst3-subproject + (lambda* (#:key inputs #:allow-other-keys) + (symlink (assoc-ref inputs "vst3sdk") "subprojects/vst3= "))) + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/chainloader/utils.cpp" + (("\"/usr/local/lib64\",") + (string-append "\"/usr/local/lib64\",\n\"" + #$output "/lib\","))) + (let ((wine + #$(match (%current-system) + ((or "x86_64-linux" "aarch64-linux") "wine64= ") + (_ "wine32"))) + (arch + #$(match (%current-system) + ((or "x86_64-linux" "aarch64-linux") + "x86_64-unix") + (_ "i386-unix")))) + (substitute* "meson.build" + (("-lole32") + (search-input-file inputs + (string-append "/lib/" wine "/wine/" + arch "/libole32.a"))) + (("-lshell32") + (search-input-file inputs + (string-append "/lib/" wine "/wine/" + arch "/libshell32.a"))) + (("-luuid") + (search-input-file inputs + (string-append "/lib/" wine "/wine/" + arch "/libuuid.a"))))))) + (replace 'install + (lambda _ + (for-each + (lambda (file) + (install-file file (string-append #$output "/bin"))= ) + (find-files "." "-host\\.exe(|\\.so)$")) + (for-each + (lambda (file) + (install-file file (string-append #$output "/lib"))= ) + (find-files "." "libyabridge"))))))) + (native-inputs + `(("clap" + ,(let ((version "1.1.7")) + (package/inherit clap + (version version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/free-audio/clap") + (commit version))) + (file-name (git-file-name "clap" version)) + (sha256 + (base32 + "1afjvllmzf2xmrpy8mcxk7zhii93b447ciaqw9lkj2wh9z217hsr"))= ))))) + ("cmake-minimal" ,cmake-minimal) + ("function2" ,function2) + ("gulrak-filesystem" ,gulrak-filesystem) + ("pkg-config" ,pkg-config) + ("tomlplusplus" ,tomlplusplus) + ;; This is VST3 SDK v3.7.7_build_19 with the documentation and VSTG= UI + ;; submodules removed and a dummy `meson.build` file that just list= s all + ;; source files. + ("vst3sdk" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/robbert-vdh/vst3sdk") + (commit (string-append "v3.7.7_build_19-patched")) + ;; Required for vst3_base, vst3_pluginterfaces, + ;; and vst3_public_sdk. + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09axvpshwbf5061kcbl26v74dcmwxmgmlxb15b75bnqbh0zcghrf")) + (patches + (search-patches + "vst3sdk-3.7.7-allow-winelib-compilation.patch")))))) + (inputs + (list asio + bitsery + dbus + libxcb + (match (%current-system) + ((or "x86_64-linux" "aarch64") wine64) + (_ wine)))) + ;; Support the platforms that are supported by wine and wine64. + (supported-systems + (package-supported-systems wine64)) + (home-page "https://github.com/robbert-vdh/yabridge") + (synopsis "Implementation of Windows VST2, VST3 and CLAP plugin APIs") + (description + "@code{yabridge} is Yet Another way to use Windows audio plugins. It +supports using both 32-bit and 64-bit Windows VST2, VST3, and CLAP plugins= in +64-bit Linux plugin hosts as if they were native plugins, with optional su= pport +for plugin groups to enable inter-plugin communication for VST2 plugins an= d +quick startup times.") + (license license:gpl3+))) + (define-public ableton-link (package (name "ableton-link") diff --git a/gnu/packages/patches/vst3sdk-3.7.7-allow-winelib-compilation.p= atch b/gnu/packages/patches/vst3sdk-3.7.7-allow-winelib-compilation.patch new file mode 100644 index 0000000000..43639f978f --- /dev/null +++ b/gnu/packages/patches/vst3sdk-3.7.7-allow-winelib-compilation.patch @@ -0,0 +1,191 @@ +This patch is taken from yabridge project: +https://github.com/robbert-vdh/yabridge. + +Submodule base contains modified content +diff --git a/base/source/fdebug.cpp b/base/source/fdebug.cpp +index b1d1dcc..9093022 100644 +--- a/base/source/fdebug.cpp ++++ b/base/source/fdebug.cpp +@@ -117,8 +117,6 @@ bool AmIBeingDebugged () + #if _MSC_VER + #include + #endif +-#define vsnprintf _vsnprintf +-#define snprintf _snprintf +=20 + #elif SMTG_OS_MACOS + #include +Submodule pluginterfaces contains modified content +diff --git a/pluginterfaces/base/fstrdefs.h b/pluginterfaces/base/fstrdefs= .h +index 848e8ee..8846d31 100644 +--- a/pluginterfaces/base/fstrdefs.h ++++ b/pluginterfaces/base/fstrdefs.h +@@ -22,6 +22,16 @@ + /** string methods defines unicode / ASCII */ + //-----------------------------------------------------------------------= ----- +=20 ++// We can use most of the VST3 SDK's Windows UTF-16 functionality by just ++// creating aliases for equivalent Linux functions ++#if __WINE__ ++#define wcsicmp wcscasecmp ++#define wcsnicmp wcsncasecmp ++#define _vsnwprintf vswprintf ++#define stricmp strcasecmp ++#define strnicmp strncasecmp ++#endif ++ + // 16 bit string operations + #if SMTG_CPP11=09// if c++11 unicode string literals + =09#define SMTG_CPP11_CAT_PRIVATE_DONT_USE(a,b)=09=09=09a ## b +diff --git a/pluginterfaces/base/ftypes.h b/pluginterfaces/base/ftypes.h +index 133dbba..33ecae3 100644 +--- a/pluginterfaces/base/ftypes.h ++++ b/pluginterfaces/base/ftypes.h +@@ -154,7 +154,7 @@ namespace Steinberg + // always inline macros (only when RELEASE is 1) + //-----------------------------------------------------------------------= ----- + #if RELEASE +- #if SMTG_OS_MACOS || SMTG_OS_LINUX || defined(__MINGW32__) ++ #if SMTG_OS_MACOS || SMTG_OS_LINUX || defined(__WINE__) + =09=09#define SMTG_ALWAYS_INLINE=09__inline__ __attribute__((__always_inl= ine__)) + =09=09#define SMTG_NEVER_INLINE __attribute__((noinline)) + =09#elif SMTG_OS_WINDOWS +diff --git a/pluginterfaces/base/ustring.cpp b/pluginterfaces/base/ustring= .cpp +index 24a412f..8e631c9 100644 +--- a/pluginterfaces/base/ustring.cpp ++++ b/pluginterfaces/base/ustring.cpp +@@ -38,6 +38,10 @@ +=20 + #endif +=20 ++#ifdef __WINE__ ++#include ++#endif ++ + //-----------------------------------------------------------------------= - + namespace Steinberg { +=20 +@@ -173,7 +177,7 @@ bool UString::scanFloat (double& value) const + bool UString::printFloat (double value, int32 precision) + { + #if SMTG_OS_WINDOWS +-=09return swprintf ((wchar_t*)thisBuffer, L"%.*lf", precision, value) != =3D -1; ++=09return swprintf ((wchar_t*)thisBuffer, thisSize, L"%.*lf", precision, = value) !=3D -1; + #elif SMTG_OS_MACOS + =09bool result =3D false; + =09CFStringRef cfStr =3D CFStringCreateWithFormat (0, 0, CFSTR("%.*lf"), = precision, value); +@@ -238,7 +242,7 @@ bool UString::scanInt (int64& value) const + bool UString::printInt (int64 value) + { + #if SMTG_OS_WINDOWS +-=09return swprintf ((wchar_t*)thisBuffer, L"%I64d", value) !=3D -1; ++=09return swprintf ((wchar_t*)thisBuffer, thisSize, L"%I64d", value) !=3D= -1; +=20 + #elif SMTG_OS_MACOS + =09CFStringRef cfStr =3D CFStringCreateWithFormat (0, 0, CFSTR("%lld"), v= alue); +Submodule public.sdk contains modified content +diff --git a/public.sdk/source/common/systemclipboard_win32.cpp b/public.s= dk/source/common/systemclipboard_win32.cpp +index c5cb2b8..2ee3d65 100644 +--- a/public.sdk/source/common/systemclipboard_win32.cpp ++++ b/public.sdk/source/common/systemclipboard_win32.cpp +@@ -111,7 +111,7 @@ bool copyTextToClipboard (const std::string& text) + =09{ + =09=09if (auto* data =3D static_cast (GlobalLock (memory))) + =09=09{ +-#if defined(__MINGW32__) ++#if defined(__WINE__) + =09=09=09memcpy (data, wideStr.data (), byteSize); + #else + =09=09=09memcpy_s (data, byteSize, wideStr.data (), byteSize); +diff --git a/public.sdk/source/vst/hosting/module_win32.cpp b/public.sdk/s= ource/vst/hosting/module_win32.cpp +index 2ba9319..ab6d72a 100644 +--- a/public.sdk/source/vst/hosting/module_win32.cpp ++++ b/public.sdk/source/vst/hosting/module_win32.cpp +@@ -44,35 +44,10 @@ + #include + #include +=20 +-#if SMTG_CPP17 +- +-#if __has_include() +-#define USE_FILESYSTEM 1 +-#elif __has_include() +-#define USE_FILESYSTEM 0 +-#endif +- +-#else // !SMTG_CPP17 +- +-#define USE_FILESYSTEM 0 +- +-#endif // SMTG_CPP17 +- +-#if USE_FILESYSTEM =3D=3D 1 +- +-#include +-namespace filesystem =3D std::filesystem; +- +-#else // USE_FILESYSTEM =3D=3D 0 +- +-// The header is deprecated. It is superseded b= y the C++17 +-// header. You can define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WA= RNING to silence the +-// warning, otherwise the build will fail in VS2019 16.3.0 +-#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING +-#include +-namespace filesystem =3D std::experimental::filesystem; +- +-#endif // USE_FILESYSTEM ++// `std::filesystem` doesn't work correctly with wineg++, resulting in we= ird ++// memory errors. This library is a drop-in replacement. ++#include ++namespace filesystem =3D ghc::filesystem; +=20 + #pragma comment(lib, "Shell32") +=20 +@@ -320,7 +295,7 @@ VST3::Optional resolveShellLink (con= st filesystem::path& p) + #elif USE_OLE + =09Ole::instance (); +=20 +-=09IShellLink* shellLink =3D nullptr; ++=09IShellLinkW* shellLink =3D nullptr; + =09if (!SUCCEEDED (CoCreateInstance (CLSID_ShellLink, nullptr, CLSCTX_INP= ROC_SERVER, + =09 IID_IShellLink, reinterpret_cast (&shellLink)))) + =09=09return {}; +@@ -405,13 +380,13 @@ void findFilesWithExt (const filesystem::path& path,= const std::string& ext, + =09=09=09=09filesystem::path result; + =09=09=09=09if (checkVST3Package (p, &result)) + =09=09=09=09{ +-=09=09=09=09=09pathList.push_back (result.generic_u8string ()); ++=09=09=09=09=09pathList.push_back (result.generic_string ()); + =09=09=09=09=09continue; + =09=09=09=09} + =09=09=09=09findFilesWithExt (cp, ext, pathList, recursive); + =09=09=09} + =09=09=09else +-=09=09=09=09pathList.push_back (cp.generic_u8string ()); ++=09=09=09=09pathList.push_back (cp.generic_string ()); + =09=09} + =09=09else if (recursive) + =09=09{ +@@ -431,18 +406,18 @@ void findFilesWithExt (const filesystem::path& path,= const std::string& ext, + =09=09=09=09=09=09=09filesystem::path result; + =09=09=09=09=09=09=09if (checkVST3Package (*resolvedLink, &result)) + =09=09=09=09=09=09=09{ +-=09=09=09=09=09=09=09=09pathList.push_back (result.generic_u8string ()); ++=09=09=09=09=09=09=09=09pathList.push_back (result.generic_string ()); + =09=09=09=09=09=09=09=09continue; + =09=09=09=09=09=09=09} + =09=09=09=09=09=09=09findFilesWithExt (*resolvedLink, ext, pathList, recu= rsive); + =09=09=09=09=09=09} + =09=09=09=09=09=09else +-=09=09=09=09=09=09=09pathList.push_back (resolvedLink->generic_u8string (= )); ++=09=09=09=09=09=09=09pathList.push_back (resolvedLink->generic_string ())= ; + =09=09=09=09=09} + =09=09=09=09=09else if (filesystem::is_directory (*resolvedLink)) + =09=09=09=09=09{ +-=09=09=09=09=09=09const auto& str =3D resolvedLink->generic_u8string (); +-=09=09=09=09=09=09if (cp.generic_u8string ().compare (0, str.size (), str= .data (), ++=09=09=09=09=09=09const auto& str =3D resolvedLink->generic_string (); ++=09=09=09=09=09=09if (cp.generic_string ().compare (0, str.size (), str.d= ata (), + =09=09=09=09=09=09 str.size ()) !=3D 0= ) + =09=09=09=09=09=09=09findFilesWithExt (*resolvedLink, ext, pathList, recu= rsive); + =09=09=09=09=09} diff --git a/gnu/packages/patches/yabridge-5.0.4-dependencies.patch b/gnu/p= ackages/patches/yabridge-5.0.4-dependencies.patch new file mode 100644 index 0000000000..77db050e91 --- /dev/null +++ b/gnu/packages/patches/yabridge-5.0.4-dependencies.patch @@ -0,0 +1,36 @@ +Meson fails to detect bitsery, function2 and gulrak-filesystem. +https://github.com/robbert-vdh/yabridge/issues/18 + +This patch removes these dependencies in "meson.build". + + +diff --git a/meson.build b/meson.build +index d8d9135b..b35ebfcd 100644 +--- a/meson.build ++++ b/meson.build +@@ -248,22 +248,13 @@ else + asio_dep =3D dependency('asio', version : '>=3D1.22.0') + endif +=20 +-if meson.version().version_compare('>=3D0.60') +- # Bitsery's CMake build definition is capitalized for some reason +- bitsery_dep =3D dependency('bitsery', 'Bitsery', version : '>=3D5.2.0') +-else +- # Mmeson <=3D0.6.0 didn't support multiple names for a dependency, and = since at +- # the moment this is only relevant for packing on Arch btw, it's probab= ly +- # better to remove this conditional later than it is to bump the minimu= m Meson +- # version now. +- bitsery_dep =3D dependency('bitsery', version : '>=3D5.2.0') +-endif ++bitsery_dep =3D declare_dependency() +=20 + # The D-Bus headers are also only accessed through the include path. We d= on't + # link to libdbus-1 to make soname changes don't completely break yabridg= e. + dbus_dep =3D dependency('dbus-1').partial_dependency(compile_args : true,= includes : true) +-function2_dep =3D dependency('function2', version : '>=3D4.0.0') +-ghc_filesystem_dep =3D dependency('ghc_filesystem', modules : 'ghcFilesys= tem::ghc_filesystem', version : '>=3D1.5.0') ++function2_dep =3D declare_dependency() ++ghc_filesystem_dep =3D declare_dependency() + threads_dep =3D dependency('threads') + # Tomlplusplus recently added a shraed library version. We don't want to = link to that. + tomlplusplus_dep =3D dependency('tomlplusplus', version : '>=3D3.3.0', de= fault_options : ['compile_library=3Dfalse']).partial_dependency(compile_arg= s : true, includes : true) --=20 2.40.1