From 61f2632dd8eb40be434dcba9d1ee1266713ca84a 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/2] New package: pyliblo-0.10.0 --- srcpkgs/pyliblo/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/pyliblo/template diff --git a/srcpkgs/pyliblo/template b/srcpkgs/pyliblo/template new file mode 100644 index 000000000000..08f3c819a5e5 --- /dev/null +++ b/srcpkgs/pyliblo/template @@ -0,0 +1,16 @@ +# 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" +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 +# Github CI fails with "testNoPermission (test.test_liblo.ServerCreationTestCase)" +make_check=ci_skip From 1dd4908df1b48e08f038974f9bc3564157bac359 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 2/2] Carla: update to 2.3.0 Carla: add pyliblo dependency Carla: fix musl build [ci-skip] --- srcpkgs/Carla/patches/libmagic.patch | 18 ++++++++++-------- srcpkgs/Carla/patches/qt5-5.15.0.patch | 10 ---------- srcpkgs/Carla/template | 17 ++++++++--------- srcpkgs/pyliblo/template | 2 +- 4 files changed, 19 insertions(+), 28 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 d53a7c56887a..2566bc88c833 100644 --- a/srcpkgs/Carla/patches/libmagic.patch +++ b/srcpkgs/Carla/patches/libmagic.patch @@ -1,14 +1,16 @@ --- source/Makefile.mk +++ source/Makefile.mk -@@ -233,10 +233,7 @@ - # Check for optional libs (special non-pkgconfig tests) +@@ -355,13 +355,7 @@ endif 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) -- -+HAVE_LIBMAGIC = 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 +-CFLAGS_WITHOUT_ARCH = $(subst -arch arm64,,$(CFLAGS)) +-HAVE_LIBMAGIC = $(shell echo '\#include ' | $(CC) $(CFLAGS_WITHOUT_ARCH) -x c -w -c - -o /dev/null 2>/dev/null && echo true) +-endif + 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 2d936a7ce7c7..000000000000 --- 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 701fd0ea30f7..13d1389cdc04 100644 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -1,7 +1,7 @@ # Template file for 'Carla' pkgname=Carla -version=2.1 -revision=3 +version=2.3.0 +revision=1 archs="x86_64* i686* aarch64* arm*" build_style=gnu-makefile pycompile_dirs="usr/share/carla" @@ -10,20 +10,19 @@ 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" homepage="https://kxstudio.linuxaudio.org/Applications:Carla" distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz" -checksum=a82ce08f3a82db9d878c8cb7e7e2f3b80834bf21801c6ec4ed95c0cfee25b963 +checksum=27def29cc408d5c74926e8d0ef3a77fd76fee1e4f2797f840e999e6376a5be03 python_version=3 -case $XBPS_TARGET_MACHINE in - x86_64* | i686*);; - *) make_build_args+=" NOOPT=true" - make_install_args+=" NOOPT=true";; -esac +# FIXME: JUCE does not compile on musl +if [ "$XBPS_TARGET_LIBC" = musl ]; then + make_build_args+=" USING_JUCE=false" +fi if [ "$CROSS_BUILD" ]; then hostmakedepends+=" Carla-devel" diff --git a/srcpkgs/pyliblo/template b/srcpkgs/pyliblo/template index 08f3c819a5e5..47617417ed3e 100644 --- a/srcpkgs/pyliblo/template +++ b/srcpkgs/pyliblo/template @@ -13,4 +13,4 @@ homepage="http://das.nasophon.de/pyliblo/" distfiles="${PYPI_SITE}/p/pyliblo/pyliblo-${version}.tar.gz" checksum=fc67f1950b827272b00f9f0dc4ed7113c0ccef0c1c09e9976dead40ebbf1798f # Github CI fails with "testNoPermission (test.test_liblo.ServerCreationTestCase)" -make_check=ci_skip +make_check=ci-skip