aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--media-sound/zrythm/Manifest2
-rw-r--r--media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-ifdef-function.patch (renamed from media-sound/zrythm/files/zrythm-1.0.0_beta341-carla.patch)0
-rw-r--r--media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-libdir.patch11
-rw-r--r--media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-plugin-clap.patch13
-rw-r--r--media-sound/zrythm/files/zrythm-1.0.0_beta371-redundant-logical-or.patch11
-rw-r--r--media-sound/zrythm/zrythm-1.0.0_beta371.ebuild (renamed from media-sound/zrythm/zrythm-1.0.0_beta341.ebuild)12
6 files changed, 46 insertions, 3 deletions
diff --git a/media-sound/zrythm/Manifest b/media-sound/zrythm/Manifest
index 5751dcd..5d5ff20 100644
--- a/media-sound/zrythm/Manifest
+++ b/media-sound/zrythm/Manifest
@@ -1,3 +1,3 @@
DIST reproc-14.2.4.tar.gz 64956 BLAKE2B a22681889d7daa1b0cc07875ef926e1c8c2d0bbe65505d9ddba42a33077bbf963ba33d733db71a76d09c67721027f846c01f023b4957ea9f44463511cae76d20 SHA512 c592521960f1950d626261738091d25efdf764ee1a0c72a58c28c66eaebf6073b2c978f1dc2c8dbe89b0be7ec1629a3a45cb1fafa0ebe21b5df8d4d27c992675
-DIST v1.0.0-beta.3.4.1.tar.gz 14083356 BLAKE2B c5c1f6151fc6ac8c19a9c741c022c3d6ca1664fe20534d0b0895a22ade4d13e64fe9e1ba5ccdbb995e476aa1ecf82df84f878819f46c562dd9a187ef8f0310a7 SHA512 58733a438d547d1a35bb2279b2e25fb3aa4938906c1983ee065200f3b7b8e545f338a48fecfa4d7248d928ea27af9b0c7ea496853cde87a5dd54460e103b7a50
+DIST v1.0.0-beta.3.7.1.tar.gz 14133038 BLAKE2B c65b74e30b126f81a07e60aac4d0307c2ceb62f349a366e5d4acb28c8e94cba3dddb4f5d2632854f2ff94edd69c3f31c9d4a14bb1ce30b4605ceb47ded6c45b3 SHA512 a53efcd418518ce51f61606dbdea7cd848ca912e74627a52395363cc855f2d4422542ae6380e9c728c7f24bb5e0c373970225b7933703d614fcae2ffd35e245f
DIST zix-afc6ef7e54988fd68f33df21ec2a220e6bfc49f4.tar.gz 59349 BLAKE2B bbe33bbeb7ba2e36249cb82ca31c17ba02022611dafb12bb0a16137e6355ed9191d53afd6e180b7e94a82ce04006eddb80a1a52d96a05a34cb85bacb3a166201 SHA512 6a33fe0ed7b16d83e04d85613a8621fa98ebdf7c8b695850998c5b9fd6e2dfdf9458379cc14e56bd9d113225a5f5d3b58c8d00ffd32542c0086b59c9f3f0fd8a
diff --git a/media-sound/zrythm/files/zrythm-1.0.0_beta341-carla.patch b/media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-ifdef-function.patch
index 36ac370..36ac370 100644
--- a/media-sound/zrythm/files/zrythm-1.0.0_beta341-carla.patch
+++ b/media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-ifdef-function.patch
diff --git a/media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-libdir.patch b/media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-libdir.patch
new file mode 100644
index 0000000..bc6a6fe
--- /dev/null
+++ b/media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-libdir.patch
@@ -0,0 +1,11 @@
+--- a/meson.build
++++ b/meson.build
+@@ -1082,7 +1082,7 @@ have_carla = carla_host_plugin_dep.found ()
+ if have_carla
+ carla_bins_dir = get_option ('carla_binaries_dir')
+ if carla_bins_dir == ''
+- carla_bins_dir = carla_host_plugin_dep.get_variable (pkgconfig: 'carla_libdir')
++ carla_bins_dir = carla_host_plugin_dep.get_variable (pkgconfig: 'libdir')
+ endif
+ install_data (
+ find_program (
diff --git a/media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-plugin-clap.patch b/media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-plugin-clap.patch
new file mode 100644
index 0000000..8f1a17b
--- /dev/null
+++ b/media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-plugin-clap.patch
@@ -0,0 +1,13 @@
+--- a/src/plugins/carla_native_plugin.c
++++ b/src/plugins/carla_native_plugin.c
+@@ -78,8 +78,10 @@ get_plugin_type_from_protocol (PluginProtocol protocol)
+ return PLUGIN_DSSI;
+ case PROT_LADSPA:
+ return PLUGIN_LADSPA;
++ /*
+ case PROT_CLAP:
+ return PLUGIN_CLAP;
++ */
+ case PROT_JSFX:
+ return PLUGIN_JSFX;
+ default:
diff --git a/media-sound/zrythm/files/zrythm-1.0.0_beta371-redundant-logical-or.patch b/media-sound/zrythm/files/zrythm-1.0.0_beta371-redundant-logical-or.patch
new file mode 100644
index 0000000..fd4e7c2
--- /dev/null
+++ b/media-sound/zrythm/files/zrythm-1.0.0_beta371-redundant-logical-or.patch
@@ -0,0 +1,11 @@
+--- a/src/gui/widgets/preferences.c
++++ b/src/gui/widgets/preferences.c
+@@ -228,7 +228,7 @@ should_be_hidden (
+ #endif
+ #ifndef HAVE_CARLA
+ KEY_IS ("Plugins", "Paths", "sfz-search-paths")
+- || KEY_IS ("Plugins", "Paths", "sf2-search-paths") ||
++ || KEY_IS ("Plugins", "Paths", "sf2-search-paths")
+ || KEY_IS ("Plugins", "Paths", "jsfx-search-paths") ||
+ #endif
+ (AUDIO_ENGINE->audio_backend != AUDIO_BACKEND_SDL
diff --git a/media-sound/zrythm/zrythm-1.0.0_beta341.ebuild b/media-sound/zrythm/zrythm-1.0.0_beta371.ebuild
index 0aba7ff..ee5d5c0 100644
--- a/media-sound/zrythm/zrythm-1.0.0_beta341.ebuild
+++ b/media-sound/zrythm/zrythm-1.0.0_beta371.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="highly automated and intuitive digital audio workstation"
HOMEPAGE="https://www.zrythm.org"
-MY_PV="v1.0.0-beta.3.4.1"
+MY_PV="v1.0.0-beta.3.7.1"
ZIX_PV="afc6ef7e54988fd68f33df21ec2a220e6bfc49f4"
REPROC_PV="14.2.4"
SRC_URI="
@@ -87,7 +87,15 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${P}-carla.patch"
+ # this function is inside of ifdef, so it doesn't exist if HAVE_CARLA is
+ # not defined, but it's still used like it's there
+ "${FILESDIR}/${P}-carla-ifdef-function.patch"
+ # carla has libdir variable, not carla_libdir
+ "${FILESDIR}/${P}-carla-libdir.patch"
+ # zrythm requires unreleased carla, we don't have that in release
+ "${FILESDIR}/${P}-carla-plugin-clap.patch"
+ # what?
+ "${FILESDIR}/${P}-redundant-logical-or.patch"
)
src_unpack() {