From 3df97e93882df0451563328cb4f88593d97813ce Mon Sep 17 00:00:00 2001 From: la-ninpre Date: Tue, 11 Oct 2022 01:27:27 +0300 Subject: media-sound/zrythm: add 1.0.0_beta371, drop 1.0.0_beta341 --- media-sound/zrythm/Manifest | 2 +- .../zrythm/files/zrythm-1.0.0_beta341-carla.patch | 13 -- ...zrythm-1.0.0_beta371-carla-ifdef-function.patch | 13 ++ .../files/zrythm-1.0.0_beta371-carla-libdir.patch | 11 ++ .../zrythm-1.0.0_beta371-carla-plugin-clap.patch | 13 ++ ...zrythm-1.0.0_beta371-redundant-logical-or.patch | 11 ++ media-sound/zrythm/zrythm-1.0.0_beta341.ebuild | 125 ------------------- media-sound/zrythm/zrythm-1.0.0_beta371.ebuild | 133 +++++++++++++++++++++ 8 files changed, 182 insertions(+), 139 deletions(-) delete mode 100644 media-sound/zrythm/files/zrythm-1.0.0_beta341-carla.patch create mode 100644 media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-ifdef-function.patch create mode 100644 media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-libdir.patch create mode 100644 media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-plugin-clap.patch create mode 100644 media-sound/zrythm/files/zrythm-1.0.0_beta371-redundant-logical-or.patch delete mode 100644 media-sound/zrythm/zrythm-1.0.0_beta341.ebuild create mode 100644 media-sound/zrythm/zrythm-1.0.0_beta371.ebuild 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_beta341-carla.patch deleted file mode 100644 index 36ac370..0000000 --- a/media-sound/zrythm/files/zrythm-1.0.0_beta341-carla.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/audio/engine.c -+++ b/src/audio/engine.c -@@ -1250,8 +1250,10 @@ engine_realloc_port_buffers ( - { - if (pl->setting->open_with_carla) - { -+#ifdef HAVE_CARLA - carla_native_plugin_update_buffer_size_and_sample_rate ( - pl->carla); -+#endif //HAVE_CARLA - } - else if (pl->setting->descr->protocol == PROT_LV2) - { diff --git a/media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-ifdef-function.patch b/media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-ifdef-function.patch new file mode 100644 index 0000000..36ac370 --- /dev/null +++ b/media-sound/zrythm/files/zrythm-1.0.0_beta371-carla-ifdef-function.patch @@ -0,0 +1,13 @@ +--- a/src/audio/engine.c ++++ b/src/audio/engine.c +@@ -1250,8 +1250,10 @@ engine_realloc_port_buffers ( + { + if (pl->setting->open_with_carla) + { ++#ifdef HAVE_CARLA + carla_native_plugin_update_buffer_size_and_sample_rate ( + pl->carla); ++#endif //HAVE_CARLA + } + else if (pl->setting->descr->protocol == PROT_LV2) + { 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_beta341.ebuild deleted file mode 100644 index 0aba7ff..0000000 --- a/media-sound/zrythm/zrythm-1.0.0_beta341.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson xdg - -DESCRIPTION="highly automated and intuitive digital audio workstation" - -HOMEPAGE="https://www.zrythm.org" - -MY_PV="v1.0.0-beta.3.4.1" -ZIX_PV="afc6ef7e54988fd68f33df21ec2a220e6bfc49f4" -REPROC_PV="14.2.4" -SRC_URI=" - https://git.sr.ht/~alextee/${PN}/archive/${MY_PV}.tar.gz - https://gitlab.com/drobilla/zix/-/archive/${ZIX_PV}/zix-${ZIX_PV}.tar.gz - https://github.com/DaanDeMeyer/reproc/archive/refs/tags/v${REPROC_PV}.tar.gz -> reproc-${REPROC_PV}.tar.gz -" - -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="AGPL-3+" - -SLOT="0" - -KEYWORDS="~amd64" - -IUSE="+X +alsa +bundled-plugins +carla +man +sdl - graphviz guile jack lsp-dsp opus pulse rtaudio rtmidi test valgrind" - -# TODO: handle tests -RESTRICT="!test? ( test )" - -RDEPEND=" - =gui-libs/libadwaita-1.2* - >=dev-libs/json-glib-1 - >=dev-libs/libcyaml-1.2.0 - >=dev-libs/serd-0.30.0 - >=dev-libs/sord-0.14.0 - >=gui-libs/gtk-4 - >=gui-libs/gtksourceview-5 - >=gui-libs/libpanel-1 - >=media-libs/fontconfig-2.13.0 - >=media-libs/graphene-1.0 - >=media-libs/libaudec-0.3.2 - >=media-libs/libsamplerate-0.1.8 - >=media-libs/libsndfile-1.0.25 - >=media-libs/lilv-0.24.6 - >=media-libs/lv2-1.16.0 - >=media-libs/sratom-0.4.0 - >=sci-libs/fftw-3.3.5 - >=x11-libs/pango-1.50 - X? ( x11-libs/libX11 ) - alsa? ( media-libs/alsa-lib ) - app-arch/zstd - carla? ( media-sound/carla ) - dev-libs/boost - dev-libs/glib - dev-libs/libpcre2 - dev-libs/xxhash - graphviz? ( media-gfx/graphviz ) - guile? ( dev-scheme/guile ) - jack? ( virtual/jack ) - kde-frameworks/breeze-icons - lsp-dsp? ( >=media-libs/lsp-dsp-lib-0.5.5 ) - media-libs/chromaprint - media-libs/libepoxy - media-libs/rubberband - media-libs/vamp-plugin-sdk - net-misc/curl - opus? ( >=media-libs/libsndfile-1.0.29 ) - pulse? ( media-libs/libpulse ) - rtaudio? ( >=media-libs/rtaudio-5.1.0 ) - rtmidi? ( >=media-libs/rtmidi-5.0.0 ) - sdl? ( media-libs/libsdl2 ) - sys-libs/libbacktrace - valgrind? ( dev-util/valgrind ) -" - -DEPEND="${RDEPEND}" - -BDEPEND=" - virtual/pkgconfig - dev-util/meson - dev-lang/sassc -" - -PATCHES=( - "${FILESDIR}/${P}-carla.patch" -) - -src_unpack() { - default - mv "${WORKDIR}/zix-${ZIX_PV}" "${S}/subprojects/zix" - mv "${WORKDIR}/reproc-${REPROC_PV}" "${S}/subprojects/reproc" -} - -src_configure() { - local emesonargs=( - -Db_lto=false - -Dcheck_updates=false - $(meson_feature X x11) - $(meson_feature alsa) - $(meson_feature carla) - $(meson_feature graphviz) - $(meson_feature guile) - $(meson_feature jack) - $(meson_feature lsp-dsp lsp_dsp) - $(meson_feature pulse) - $(meson_feature rtaudio) - $(meson_feature rtmidi) - $(meson_feature sdl) - $(meson_feature valgrind) - $(meson_use bundled-plugins bundled_plugins) - $(meson_use man manpage) - $(meson_use opus) - $(meson_use test tests) - ) - meson_src_configure -} - -src_install() { - meson_src_install --skip-subprojects zix,reproc -} diff --git a/media-sound/zrythm/zrythm-1.0.0_beta371.ebuild b/media-sound/zrythm/zrythm-1.0.0_beta371.ebuild new file mode 100644 index 0000000..ee5d5c0 --- /dev/null +++ b/media-sound/zrythm/zrythm-1.0.0_beta371.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson xdg + +DESCRIPTION="highly automated and intuitive digital audio workstation" + +HOMEPAGE="https://www.zrythm.org" + +MY_PV="v1.0.0-beta.3.7.1" +ZIX_PV="afc6ef7e54988fd68f33df21ec2a220e6bfc49f4" +REPROC_PV="14.2.4" +SRC_URI=" + https://git.sr.ht/~alextee/${PN}/archive/${MY_PV}.tar.gz + https://gitlab.com/drobilla/zix/-/archive/${ZIX_PV}/zix-${ZIX_PV}.tar.gz + https://github.com/DaanDeMeyer/reproc/archive/refs/tags/v${REPROC_PV}.tar.gz -> reproc-${REPROC_PV}.tar.gz +" + +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="AGPL-3+" + +SLOT="0" + +KEYWORDS="~amd64" + +IUSE="+X +alsa +bundled-plugins +carla +man +sdl + graphviz guile jack lsp-dsp opus pulse rtaudio rtmidi test valgrind" + +# TODO: handle tests +RESTRICT="!test? ( test )" + +RDEPEND=" + =gui-libs/libadwaita-1.2* + >=dev-libs/json-glib-1 + >=dev-libs/libcyaml-1.2.0 + >=dev-libs/serd-0.30.0 + >=dev-libs/sord-0.14.0 + >=gui-libs/gtk-4 + >=gui-libs/gtksourceview-5 + >=gui-libs/libpanel-1 + >=media-libs/fontconfig-2.13.0 + >=media-libs/graphene-1.0 + >=media-libs/libaudec-0.3.2 + >=media-libs/libsamplerate-0.1.8 + >=media-libs/libsndfile-1.0.25 + >=media-libs/lilv-0.24.6 + >=media-libs/lv2-1.16.0 + >=media-libs/sratom-0.4.0 + >=sci-libs/fftw-3.3.5 + >=x11-libs/pango-1.50 + X? ( x11-libs/libX11 ) + alsa? ( media-libs/alsa-lib ) + app-arch/zstd + carla? ( media-sound/carla ) + dev-libs/boost + dev-libs/glib + dev-libs/libpcre2 + dev-libs/xxhash + graphviz? ( media-gfx/graphviz ) + guile? ( dev-scheme/guile ) + jack? ( virtual/jack ) + kde-frameworks/breeze-icons + lsp-dsp? ( >=media-libs/lsp-dsp-lib-0.5.5 ) + media-libs/chromaprint + media-libs/libepoxy + media-libs/rubberband + media-libs/vamp-plugin-sdk + net-misc/curl + opus? ( >=media-libs/libsndfile-1.0.29 ) + pulse? ( media-libs/libpulse ) + rtaudio? ( >=media-libs/rtaudio-5.1.0 ) + rtmidi? ( >=media-libs/rtmidi-5.0.0 ) + sdl? ( media-libs/libsdl2 ) + sys-libs/libbacktrace + valgrind? ( dev-util/valgrind ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + virtual/pkgconfig + dev-util/meson + dev-lang/sassc +" + +PATCHES=( + # 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() { + default + mv "${WORKDIR}/zix-${ZIX_PV}" "${S}/subprojects/zix" + mv "${WORKDIR}/reproc-${REPROC_PV}" "${S}/subprojects/reproc" +} + +src_configure() { + local emesonargs=( + -Db_lto=false + -Dcheck_updates=false + $(meson_feature X x11) + $(meson_feature alsa) + $(meson_feature carla) + $(meson_feature graphviz) + $(meson_feature guile) + $(meson_feature jack) + $(meson_feature lsp-dsp lsp_dsp) + $(meson_feature pulse) + $(meson_feature rtaudio) + $(meson_feature rtmidi) + $(meson_feature sdl) + $(meson_feature valgrind) + $(meson_use bundled-plugins bundled_plugins) + $(meson_use man manpage) + $(meson_use opus) + $(meson_use test tests) + ) + meson_src_configure +} + +src_install() { + meson_src_install --skip-subprojects zix,reproc +} -- cgit v1.2.3