From c8f4a20cf8787de40116391731f8f9cc616d92cf Mon Sep 17 00:00:00 2001 From: jkoderu-git <64820459+jkoderu-git@users.noreply.github.com> Date: Sat, 4 Jul 2020 18:19:40 +0000 Subject: [PATCH 1/6] Carla: update to 2.1.1 --- srcpkgs/Carla/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template index 8ea0fb0ab7b..9d735ddcc3a 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.1.1 +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=8611d6fc579ea55ab205cfb72571eb304da9ef997e7bbae5af5a339ef533d5d9 python_version=3 case $XBPS_TARGET_MACHINE in From bea33808a4a11835b5ca65b5ba7ba536a1cc8da1 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/6] 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 9d735ddcc3a..3bc2692fccd 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 0f04125fad21b9076af9f8d3617ca17bc8beea70 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 3/6] New package: pyliblo-0.10.0 --- srcpkgs/pyliblo/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/pyliblo/template diff --git a/srcpkgs/pyliblo/template b/srcpkgs/pyliblo/template new file mode 100644 index 00000000000..f5e6e340a96 --- /dev/null +++ b/srcpkgs/pyliblo/template @@ -0,0 +1,20 @@ +# Template file for 'pyliblo' +pkgname=pyliblo +version=0.10.0 +revision=1 +archs=noarch +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 + +post_install() { + vlicense COPYING +} From f1f81a8ffd626dffdd93826559061d2ac33f2b11 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 4/6] Carla: update to 2.2.0 --- srcpkgs/Carla/patches/libmagic.patch | 14 -------------- srcpkgs/Carla/patches/qt5-5.15.0.patch | 10 ---------- srcpkgs/Carla/template | 4 ++-- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/Carla/patches/libmagic.patch 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 deleted file mode 100644 index d53a7c56887..00000000000 --- a/srcpkgs/Carla/patches/libmagic.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- source/Makefile.mk -+++ source/Makefile.mk -@@ -233,10 +233,7 @@ - # 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) -- -+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 3bc2692fccd..eb11a21bddd 100644 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -1,6 +1,6 @@ # Template file for 'Carla' pkgname=Carla -version=2.1.1 +version=2.2.0 revision=1 archs="x86_64* i686* aarch64* arm*" build_style=gnu-makefile @@ -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=8611d6fc579ea55ab205cfb72571eb304da9ef997e7bbae5af5a339ef533d5d9 +checksum=4bf08511257db88979eccc002f10c153ff2a14f5143291c2be39cadd69ce10e1 python_version=3 case $XBPS_TARGET_MACHINE in From e4fe8ffc96000b0165a5e4196762bf6a0d67b2f7 Mon Sep 17 00:00:00 2001 From: jkoderu-git <64820459+jkoderu-git@users.noreply.github.com> Date: Thu, 15 Oct 2020 16:23:51 +0200 Subject: [PATCH 5/6] pyliblo: fix xlint [ci skip] --- srcpkgs/pyliblo/template | 5 ----- 1 file changed, 5 deletions(-) diff --git a/srcpkgs/pyliblo/template b/srcpkgs/pyliblo/template index f5e6e340a96..92769126a27 100644 --- a/srcpkgs/pyliblo/template +++ b/srcpkgs/pyliblo/template @@ -2,7 +2,6 @@ pkgname=pyliblo version=0.10.0 revision=1 -archs=noarch wrksrc="pyliblo-${version}" build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" @@ -14,7 +13,3 @@ license="LGPL-2.1-or-later" homepage="http://das.nasophon.de/pyliblo/" distfiles="${PYPI_SITE}/p/pyliblo/pyliblo-${version}.tar.gz" checksum=fc67f1950b827272b00f9f0dc4ed7113c0ccef0c1c09e9976dead40ebbf1798f - -post_install() { - vlicense COPYING -} From 7f5d3b4e0111c9bb9acc823da3beb9ed4b9b89c6 Mon Sep 17 00:00:00 2001 From: jkoderu-git <64820459+jkoderu-git@users.noreply.github.com> Date: Thu, 15 Oct 2020 16:34:11 +0200 Subject: [PATCH 6/6] Carla: update libmagic patch [ci skip] --- srcpkgs/Carla/patches/libmagic.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/Carla/patches/libmagic.patch diff --git a/srcpkgs/Carla/patches/libmagic.patch b/srcpkgs/Carla/patches/libmagic.patch new file mode 100644 index 00000000000..e86b6a08243 --- /dev/null +++ b/srcpkgs/Carla/patches/libmagic.patch @@ -0,0 +1,17 @@ +--- source/Makefile.mk ++++ source/Makefile.mk +@@ -298,14 +298,7 @@ +# Check for optional libs (special non-pkgconfig tests) + +ifneq ($(WIN32),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 +- +endif + +# ---------------------------------------------------------------------------------------------------------------------