From: jkoderu-git <jkoderu-git@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Carla: update to 2.2.0
Date: Fri, 30 Apr 2021 22:43:31 +0200 [thread overview]
Message-ID: <20210430204331._gHWK0O6A9eTtEtt3GtGdSgDPtRFrA-exmGIKeRL2Cw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23390@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
There is an updated pull request by jkoderu-git against master on the void-packages repository
https://github.com/jkoderu-git/void-packages patch-1
https://github.com/void-linux/void-packages/pull/23390
Carla: update to 2.2.0
@nutcase84
A patch file from https://github.com/void-linux/void-packages/pull/23390.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-patch-1-23390.patch --]
[-- Type: text/x-diff, Size: 6873 bytes --]
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 000000000000..92769126a27e
--- /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 <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="http://das.nasophon.de/pyliblo/"
+distfiles="${PYPI_SITE}/p/pyliblo/pyliblo-${version}.tar.gz"
+checksum=fc67f1950b827272b00f9f0dc4ed7113c0ccef0c1c09e9976dead40ebbf1798f
From 1bfd370c2f12e3a8b195047fae098e46ffcf7692 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 +-
srcpkgs/pyliblo/template | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 8ea0fb0ab7bf..3aec9f389132 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 <nutcase84@protonmail.com>"
license="GPL-2.0-or-later"
diff --git a/srcpkgs/pyliblo/template b/srcpkgs/pyliblo/template
index 92769126a27e..7be04e695ba1 100644
--- a/srcpkgs/pyliblo/template
+++ b/srcpkgs/pyliblo/template
@@ -13,3 +13,5 @@ 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 b2ebb0902078e3ecd42b47e732a17455f508eab4 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.3.0
---
srcpkgs/Carla/patches/libmagic.patch | 18 ++++++++++--------
srcpkgs/Carla/patches/qt5-5.15.0.patch | 10 ----------
srcpkgs/Carla/template | 8 ++++----
3 files changed, 14 insertions(+), 22 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 <magic.h>' | $(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 <magic.h>' | $(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 <QtGui/QPainter>
-+# include <QtGui/QPainterPath>
- # include <QtGui/QPixmapCache>
- # include <QtWidgets/qdrawutil.h>
- # include <QtWidgets/QApplication>
diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 3aec9f389132..b04c9f05ce70 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,11 +1,11 @@
# Template file for 'Carla'
pkgname=Carla
-version=2.1
-revision=2
+version=2.3.0
+revision=1
archs="x86_64* i686* aarch64* arm*"
build_style=gnu-makefile
pycompile_dirs="usr/share/carla"
-hostmakedepends="pkg-config python3-PyQt5-devel-tools which"
+hostmakedepends="pkg-config python3 python3-PyQt5-devel-tools which"
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
@@ -16,7 +16,7 @@ maintainer="nutcase84 <nutcase84@protonmail.com>"
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
From 18d1a4157077f2b0cf9337152876feaa953238e0 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 | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index b04c9f05ce70..f896db7b9c59 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -20,9 +20,8 @@ checksum=27def29cc408d5c74926e8d0ef3a77fd76fee1e4f2797f840e999e6376a5be03
python_version=3
case $XBPS_TARGET_MACHINE in
- x86_64* | i686*);;
- *) make_build_args+=" NOOPT=true"
- make_install_args+=" NOOPT=true";;
+ # No musl support for JUCE
+ *-musl) make_build_args+=" USING_JUCE=false";;
esac
if [ "$CROSS_BUILD" ]; then
next prev parent reply other threads:[~2021-04-30 20:43 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-04 18:19 [PR PATCH] Carla: update to 2.1.1 jkoderu-git
2020-07-15 7:40 ` jkoderu-git
2020-07-22 6:17 ` fosslinux
2020-07-27 4:05 ` [PR PATCH] [Updated] " jkoderu-git
2020-07-27 6:30 ` fosslinux
2020-07-27 15:27 ` [PR PATCH] [Updated] " jkoderu-git
2020-07-27 15:27 ` jkoderu-git
2020-10-15 10:15 ` [PR PATCH] [Updated] " jkoderu-git
2020-10-15 14:35 ` [PR PATCH] [Updated] Carla: update to 2.2.0 jkoderu-git
2020-10-15 14:43 ` jkoderu-git
2020-10-15 15:17 ` ericonr
2020-10-16 21:23 ` jkoderu-git
2020-10-16 22:48 ` [PR PATCH] [Updated] " jkoderu-git
2020-10-16 23:07 ` jkoderu-git
2020-10-16 23:08 ` jkoderu-git
2020-12-29 10:19 ` fosslinux
2021-02-18 6:06 ` ericonr
2021-04-18 5:06 ` [PR REVIEW] " ericonr
2021-04-18 5:06 ` ericonr
2021-04-30 20:41 ` [PR PATCH] [Updated] " jkoderu-git
2021-04-30 20:43 ` jkoderu-git [this message]
2021-04-30 20:54 ` jkoderu-git
2021-04-30 21:00 ` [PR PATCH] [Closed]: " jkoderu-git
2021-04-30 21:00 ` [PR PATCH] [Updated] " jkoderu-git
2021-04-30 21:23 ` ericonr
2021-04-30 22:06 ` jkoderu-git
2021-04-30 22:22 ` [PR PATCH] [Updated] Carla: update to 2.3.0 jkoderu-git
2021-04-30 22:26 ` jkoderu-git
2021-04-30 22:28 ` jkoderu-git
2021-04-30 23:05 ` [PR REVIEW] " ericonr
2021-04-30 23:05 ` ericonr
2021-04-30 23:12 ` jkoderu-git
2021-04-30 23:45 ` [PR PATCH] [Updated] " jkoderu-git
2021-05-01 1:00 ` [PR REVIEW] " ericonr
2021-05-01 11:30 ` jkoderu-git
2021-05-03 2:05 ` ericonr
2021-05-03 2:07 ` ericonr
2021-05-21 16:38 ` [PR PATCH] [Updated] " jkoderu-git
2021-05-21 16:39 ` [PR REVIEW] " jkoderu-git
2021-05-21 16:41 ` [PR PATCH] [Updated] " jkoderu-git
2021-05-21 17:00 ` [PR REVIEW] " paper42
2021-05-21 17:21 ` [PR PATCH] [Updated] " jkoderu-git
2021-05-21 17:21 ` [PR REVIEW] " jkoderu-git
2021-05-21 17:24 ` [PR PATCH] [Updated] " jkoderu-git
2021-05-21 17:29 ` paper42
2021-05-21 17:32 ` jkoderu-git
2021-05-21 17:33 ` jkoderu-git
2021-05-21 17:39 ` sgn
2021-05-21 17:44 ` [PR PATCH] [Updated] " jkoderu-git
2021-05-21 17:45 ` jkoderu-git
2021-08-07 22:42 ` paper42
2021-08-07 22:48 ` [PR REVIEW] " paper42
2021-12-07 3:14 ` ericonr
2021-12-07 3:14 ` [PR PATCH] [Closed]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210430204331._gHWK0O6A9eTtEtt3GtGdSgDPtRFrA-exmGIKeRL2Cw@z \
--to=jkoderu-git@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).