From 90bf13f387af0f32e13a1010e06697d4fd398fb6 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Fri, 30 Jul 2021 01:01:18 +0100 Subject: [PATCH] add vamp plugin sdk dependency --- appimage/appimage-builder.yml.in | 1 + arch/PKGBUILD.in | 2 +- debian/control.in | 1 + gnu-linux/installer.sh.in | 18 +++++++----------- gnu-linux/make_installer_zip.sh.in | 2 +- osx-brew/zrythm.rb.in | 1 + rpm/zrythm.spec.in | 3 +++ windows-msys/PKGBUILD.in | 1 + 8 files changed, 16 insertions(+), 13 deletions(-) diff --git a/appimage/appimage-builder.yml.in b/appimage/appimage-builder.yml.in index eda7013..382be35 100644 --- a/appimage/appimage-builder.yml.in +++ b/appimage/appimage-builder.yml.in @@ -67,6 +67,7 @@ AppDir: - libxxhash0 - shared-mime-info - breeze-icon-theme + - vamp-plugin-sdk exclude: - dpkg diff --git a/arch/PKGBUILD.in b/arch/PKGBUILD.in index 92b5ef0..2de56bf 100644 --- a/arch/PKGBUILD.in +++ b/arch/PKGBUILD.in @@ -27,7 +27,7 @@ license=('AGPL3') depends=('curl' 'gtk3' 'lilv' 'libx11' 'jack' 'libsndfile' 'libyaml' 'libsamplerate' 'guile' 'gtksourceview4' 'alsa-lib' 'fftw' 'graphviz' 'rtmidi' 'rtaudio' 'breeze-icons' 'zstd' - 'rubberband' 'xdg-utils' 'sdl2' 'xxhash') + 'rubberband' 'xdg-utils' 'sdl2' 'xxhash' 'vamp-plugin-sdk') makedepends=( 'python' 'gettext' 'sed' 'ninja' 'help2man' 'python-sphinx' diff --git a/debian/control.in b/debian/control.in index 9ab62e4..347f733 100644 --- a/debian/control.in +++ b/debian/control.in @@ -29,6 +29,7 @@ Build-Depends: debhelper (>=9), libxxhash-dev, ninja-build, portaudio19-dev, + vamp-plugin-sdk, python3-sphinx Standards-Version: 3.9.8 Homepage: https://www.zrythm.org/ diff --git a/gnu-linux/installer.sh.in b/gnu-linux/installer.sh.in index b49c004..e2a041c 100755 --- a/gnu-linux/installer.sh.in +++ b/gnu-linux/installer.sh.in @@ -37,9 +37,8 @@ fi debian_10_str="Debian GNU/Linux 10" debian_11_str="Debian GNU/Linux 11" ubuntu_18_04="Ubuntu 18.04" -ubuntu_20_10_str="Ubuntu 20.10" ubuntu_20_04_str="Ubuntu 20.04" -ubuntu_21_04_str="Ubuntu 21.04" +ubuntu_21_10_str="Ubuntu 21.10" zenity_width=360 have_zenity=0 @@ -64,9 +63,9 @@ if [[ "$ID" = *"ubuntu"* ]]; then elif [[ "$VERSION_ID" = *"20.04"* ]] || [[ "$UBUNTU_CODENAME" = "focal" ]]; then echo "found $ubuntu_20_04_str" distro_identifier="ubuntu2004" - elif [[ "$VERSION_ID" = *"20.10"* ]] || [[ "$UBUNTU_CODENAME" = "groovy" ]]; then - echo "found $ubuntu_20_10_str" - distro_identifier="ubuntu2010" + elif [[ "$VERSION_ID" = *"21.10"* ]] || [[ "$UBUNTU_CODENAME" = "impish" ]]; then + echo "found $ubuntu_21_10_str" + distro_identifier="ubuntu2110" fi elif [[ "$ID_LIKE" = *"ubuntu"* ]]; then if [[ "$UBUNTU_CODENAME" = *"bionic"* ]]; then @@ -75,12 +74,9 @@ elif [[ "$ID_LIKE" = *"ubuntu"* ]]; then elif [[ "$UBUNTU_CODENAME" = *"focal"* ]]; then echo "found $ubuntu_20_04_str" distro_identifier="ubuntu2004" - elif [[ "$UBUNTU_CODENAME" = *"groovy"* ]]; then - echo "found $ubuntu_20_10_str" - distro_identifier="ubuntu2010" - elif [[ "$UBUNTU_CODENAME" = *"hirsute"* ]]; then - echo "found $ubuntu_20_11_str" - distro_identifier="debian11" + elif [[ "$UBUNTU_CODENAME" = *"impish"* ]]; then + echo "found $ubuntu_21_10_str" + distro_identifier="ubuntu2110" fi elif [[ "$ID" = *"trisquel"* ]]; then if [[ "$VERSION_ID" = *"9.0"* ]]; then diff --git a/gnu-linux/make_installer_zip.sh.in b/gnu-linux/make_installer_zip.sh.in index ae93709..c700a91 100755 --- a/gnu-linux/make_installer_zip.sh.in +++ b/gnu-linux/make_installer_zip.sh.in @@ -26,7 +26,7 @@ readme=$4 # dir holding each package packages_dir="@PACKAGES_DIR@" -distros="archlinux debian10 debian11 ubuntu1804 ubuntu2004 ubuntu2010 fedora33 fedora34" +distros="archlinux debian10 debian11 ubuntu1804 ubuntu2004 ubuntu2110 fedora33 fedora34" get_pkg_filename_from_distro_sh="@MESON_BUILD_ROOT@/scripts/get_pkg_filename_from_distro.sh" zip_filename=`basename $out_file` zip_inner_dir_name="${zip_filename%.*}" diff --git a/osx-brew/zrythm.rb.in b/osx-brew/zrythm.rb.in index 6d612d1..60579d4 100644 --- a/osx-brew/zrythm.rb.in +++ b/osx-brew/zrythm.rb.in @@ -47,6 +47,7 @@ class Zrythm@TRIAL_INITIAL_UPPERCASE@ < Formula depends_on "qjackctl" depends_on "pcre2" depends_on "xxhash" + depends_on "vamp-plugin-sdk" def install mkdir "build" do diff --git a/rpm/zrythm.spec.in b/rpm/zrythm.spec.in index 26d3071..55afbc4 100644 --- a/rpm/zrythm.spec.in +++ b/rpm/zrythm.spec.in @@ -30,6 +30,7 @@ BuildRequires: help2man BuildRequires: SDL2-devel BuildRequires: graphviz-devel BuildRequires: xxhash-devel +BuildRequires: vamp-plugin-sdk-devel Requires: libcurl Requires: ladspa Requires: lv2 @@ -37,6 +38,7 @@ Requires: xdg-utils Requires: SDL2 Requires: graphviz Requires: xxhash +Requires: vamp-plugin-sdk %if 0%{?suse_version} BuildRequires: jack-devel libX11-devel update-desktop-files BuildRequires: fftw3-threads-devel librubberband-devel @@ -134,6 +136,7 @@ done %doc README.md CONTRIBUTING.md INSTALL.md CHANGELOG.md %{_bindir}/zrythm %{_bindir}/zrythm_launch +%{_bindir}/zrythm_lv2apply %{_bindir}/zrythm_gdb %{_bindir}/zrythm_valgrind %{_datadir}/applications/org.zrythm.Zrythm.desktop diff --git a/windows-msys/PKGBUILD.in b/windows-msys/PKGBUILD.in index 83a80fb..6c3f6f2 100644 --- a/windows-msys/PKGBUILD.in +++ b/windows-msys/PKGBUILD.in @@ -42,6 +42,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gtk3" "${MINGW_PACKAGE_PREFIX}-SDL2" "${MINGW_PACKAGE_PREFIX}-zstd" "${MINGW_PACKAGE_PREFIX}-libyaml" + "${MINGW_PACKAGE_PREFIX}-vamp-plugin-sdk" "${MINGW_PACKAGE_PREFIX}-xxhash") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-gettext"