From 37d31fd229a8558dedb7524391cbb01212bd8de2 Mon Sep 17 00:00:00 2001 From: jkoderu-git <64820459+jkoderu-git@users.noreply.github.com> Date: Mon, 27 Jul 2020 15:27:08 +0000 Subject: [PATCH 1/4] New package: pyliblo-0.10.0 --- srcpkgs/pyliblo/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/pyliblo/template diff --git a/srcpkgs/pyliblo/template b/srcpkgs/pyliblo/template new file mode 100644 index 00000000000..92769126a27 --- /dev/null +++ b/srcpkgs/pyliblo/template @@ -0,0 +1,15 @@ +# Template file for 'pyliblo' +pkgname=pyliblo +version=0.10.0 +revision=1 +wrksrc="pyliblo-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools python3-Cython" +makedepends="python3-devel liblo-devel" +depends="liblo" +short_desc="Python bindings for the liblo OSC library" +maintainer="Orphaned " +license="LGPL-2.1-or-later" +homepage="http://das.nasophon.de/pyliblo/" +distfiles="${PYPI_SITE}/p/pyliblo/pyliblo-${version}.tar.gz" +checksum=fc67f1950b827272b00f9f0dc4ed7113c0ccef0c1c09e9976dead40ebbf1798f From 5f769f800c5d4ccfdf71a91219eaed2f40961e82 Mon Sep 17 00:00:00 2001 From: jkoderu-git <64820459+jkoderu-git@users.noreply.github.com> Date: Mon, 27 Jul 2020 04:05:03 +0000 Subject: [PATCH 2/4] Carla: add pyliblo dependency --- srcpkgs/Carla/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template index 8ea0fb0ab7b..3aec9f38913 100644 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -10,7 +10,7 @@ makedepends="python3-PyQt5 libmagic file-devel libsndfile-devel liblo-devel alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel python3-rdflib" -depends="python3 python3-PyQt5 python3-PyQt5-svg which" +depends="python3 python3-PyQt5 python3-PyQt5-svg pyliblo which" short_desc="Audio plugin host" maintainer="nutcase84 " license="GPL-2.0-or-later" From f30aa1398672d59aaa1f70abe1757da3c37eaeaf Mon Sep 17 00:00:00 2001 From: jkoderu-git <64820459+jkoderu-git@users.noreply.github.com> Date: Thu, 15 Oct 2020 12:11:18 +0200 Subject: [PATCH 3/4] Carla: update to 2.2.0 --- srcpkgs/Carla/patches/libmagic.patch | 11 +++++++---- srcpkgs/Carla/patches/qt5-5.15.0.patch | 10 ---------- srcpkgs/Carla/template | 6 +++--- 3 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/Carla/patches/qt5-5.15.0.patch diff --git a/srcpkgs/Carla/patches/libmagic.patch b/srcpkgs/Carla/patches/libmagic.patch index d53a7c56887..aad84f06d9d 100644 --- a/srcpkgs/Carla/patches/libmagic.patch +++ b/srcpkgs/Carla/patches/libmagic.patch @@ -1,14 +1,17 @@ --- source/Makefile.mk +++ source/Makefile.mk -@@ -233,10 +233,7 @@ +@@ -298,14 +298,7 @@ endif # Check for optional libs (special non-pkgconfig tests) ifneq ($(WIN32),true) - --# libmagic doesn't have a pkg-config file, so we need to call the compiler to test it --HAVE_LIBMAGIC = $(shell echo '\#include ' | $(CC) $(CFLAGS) -x c -w -c - -o .libmagic-tmp 2>/dev/null && echo true) +-ifeq ($(shell $(PKG_CONFIG) --exists libmagic && echo true),true) + HAVE_LIBMAGIC = true +-else +-# old libmagic versions don't have a pkg-config file, so we need to call the compiler to test it +-HAVE_LIBMAGIC = $(shell echo '\#include ' | $(CC) $(CFLAGS) -x c -w -c - -o /dev/null 2>/dev/null && echo true) +-endif - -+HAVE_LIBMAGIC = true endif # --------------------------------------------------------------------------------------------------------------------- diff --git a/srcpkgs/Carla/patches/qt5-5.15.0.patch b/srcpkgs/Carla/patches/qt5-5.15.0.patch deleted file mode 100644 index 2d936a7ce7c..00000000000 --- a/srcpkgs/Carla/patches/qt5-5.15.0.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- source/theme/CarlaStyle.cpp 2020-04-13 05:29:06.000000000 +0200 -+++ source/theme/CarlaStyle.cpp 2020-08-23 20:32:26.157269175 +0200 -@@ -22,6 +22,7 @@ - - #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) - # include -+# include - # include - # include - # include diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template index 3aec9f38913..eb11a21bddd 100644 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -1,7 +1,7 @@ # Template file for 'Carla' pkgname=Carla -version=2.1 -revision=2 +version=2.2.0 +revision=1 archs="x86_64* i686* aarch64* arm*" build_style=gnu-makefile pycompile_dirs="usr/share/carla" @@ -16,7 +16,7 @@ maintainer="nutcase84 " license="GPL-2.0-or-later" homepage="https://kxstudio.linuxaudio.org/Applications:Carla" distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz" -checksum=a82ce08f3a82db9d878c8cb7e7e2f3b80834bf21801c6ec4ed95c0cfee25b963 +checksum=4bf08511257db88979eccc002f10c153ff2a14f5143291c2be39cadd69ce10e1 python_version=3 case $XBPS_TARGET_MACHINE in From fceaef577f8febcbc00a182d20ffb8394065c476 Mon Sep 17 00:00:00 2001 From: jkoderu-git <64820459+jkoderu-git@users.noreply.github.com> Date: Sat, 17 Oct 2020 00:42:33 +0200 Subject: [PATCH 4/4] Carla: fix x86_64-musl build No musl support for JUCE (VST3 plugins) --- srcpkgs/Carla/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template index eb11a21bddd..5b79357061e 100644 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -20,7 +20,8 @@ checksum=4bf08511257db88979eccc002f10c153ff2a14f5143291c2be39cadd69ce10e1 python_version=3 case $XBPS_TARGET_MACHINE in - x86_64* | i686*);; + x86_64 | i686);; + x86_64-musl) make_build_args+=" USING_JUCE=false";; *) make_build_args+=" NOOPT=true" make_install_args+=" NOOPT=true";; esac