[PR PATCH] Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[PR PATCH] Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[Animeshz]

[-- Attachment #1: Type: text/plain, Size: 1074 bytes --]

There is a new pull request by Animeshz against master on the void-packages repository

https://github.com/Animeshz/void-packages carla-update
https://github.com/void-linux/void-packages/pull/33809

Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)
Older version breaks on Python 3.10, see: falkTX/Carla#1489. PR simply bumps the version.

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl

A patch file from https://github.com/void-linux/void-packages/pull/33809.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-update-33809.patch --]
[-- Type: text/x-diff, Size: 1084 bytes --]

From 3e04a05b25efad579b81d6a32aac18f6451b11bd Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 17:55:43 +0530
Subject: [PATCH] Carla: update to 2.4.1 (with fix to non-explicit cast with
 Python3.10)

---
 srcpkgs/Carla/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 7ab456abe988..81e538623367 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,6 +1,6 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.1
+version=2.4.1
 revision=4
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
@@ -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=bbb188a672ea8871b11648d36770ba013497d03407ca9c73ed68429016f7536f
 python_version=3
 
 case $XBPS_TARGET_MACHINE in

Re: [PR PATCH] [Updated] Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[Animeshz]

[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]

There is an updated pull request by Animeshz against master on the void-packages repository

https://github.com/Animeshz/void-packages carla-update
https://github.com/void-linux/void-packages/pull/33809

Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)
Older version breaks on Python 3.10, see: falkTX/Carla#1489. PR simply bumps the version.

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl

A patch file from https://github.com/void-linux/void-packages/pull/33809.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-update-33809.patch --]
[-- Type: text/x-diff, Size: 1725 bytes --]

From 3e04a05b25efad579b81d6a32aac18f6451b11bd Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 17:55:43 +0530
Subject: [PATCH 1/2] Carla: update to 2.4.1 (with fix to non-explicit cast
 with Python3.10)

---
 srcpkgs/Carla/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 7ab456abe988..81e538623367 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,6 +1,6 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.1
+version=2.4.1
 revision=4
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
@@ -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=bbb188a672ea8871b11648d36770ba013497d03407ca9c73ed68429016f7536f
 python_version=3
 
 case $XBPS_TARGET_MACHINE in

From da0ecb93f475e7c173d463d34c92e3726196ca14 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 18:00:55 +0530
Subject: [PATCH 2/2] reverts revision to 1

---
 srcpkgs/Carla/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 81e538623367..9a4cd39bc647 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.4.1
-revision=4
+revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"

Re: [PR PATCH] [Updated] Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[Animeshz]

[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]

There is an updated pull request by Animeshz against master on the void-packages repository

https://github.com/Animeshz/void-packages carla-update
https://github.com/void-linux/void-packages/pull/33809

Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)
Older version breaks on Python 3.10, see: falkTX/Carla#1489. PR simply bumps the version.

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [x] armv7l
  - [x] armv6l-musl

A patch file from https://github.com/void-linux/void-packages/pull/33809.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-update-33809.patch --]
[-- Type: text/x-diff, Size: 3578 bytes --]

From 3e04a05b25efad579b81d6a32aac18f6451b11bd Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 17:55:43 +0530
Subject: [PATCH 1/3] Carla: update to 2.4.1 (with fix to non-explicit cast
 with Python3.10)

---
 srcpkgs/Carla/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 7ab456abe988..81e538623367 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,6 +1,6 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.1
+version=2.4.1
 revision=4
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
@@ -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=bbb188a672ea8871b11648d36770ba013497d03407ca9c73ed68429016f7536f
 python_version=3
 
 case $XBPS_TARGET_MACHINE in

From da0ecb93f475e7c173d463d34c92e3726196ca14 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 18:00:55 +0530
Subject: [PATCH 2/3] reverts revision to 1

---
 srcpkgs/Carla/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 81e538623367..9a4cd39bc647 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.4.1
-revision=4
+revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"

From a2e1df43d35af0c92e3afd0c8ca66f48165c845f Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 18:30:05 +0530
Subject: [PATCH 3/3] remove already fixed patches in upstream

---
 srcpkgs/Carla/patches/libmagic.patch   | 14 --------------
 srcpkgs/Carla/patches/qt5-5.15.0.patch | 10 ----------
 2 files changed, 24 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 f116eadc68ce..000000000000
--- a/srcpkgs/Carla/patches/libmagic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/source/Makefile.mk
-+++ b/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 <magic.h>' | $(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 ed58b7f6e69e..000000000000
--- a/srcpkgs/Carla/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/source/theme/CarlaStyle.cpp	2020-04-13 05:29:06.000000000 +0200
-+++ b/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>

Re: Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[Animeshz]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

New comment by Animeshz on void-packages repository

https://github.com/void-linux/void-packages/pull/33809#issuecomment-954807723

Comment:
Seems like Carla itself [does not support musl-libc](https://github.com/falkTX/Carla/blob/25c61989de0cfe55e4ff62af002403c9acaa1bd6/source/includes/vst3sdk/pluginterfaces/base/fplatform.h#L87).

Re: Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[paper42]

[-- Attachment #1: Type: text/plain, Size: 654 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33809#issuecomment-954857712

Comment:
see #23390

> Seems like Carla itself [does not support musl-libc](https://github.com/falkTX/Carla/blob/25c61989de0cfe55e4ff62af002403c9acaa1bd6/source/includes/vst3sdk/pluginterfaces/base/fplatform.h#L87).

If you want to dig into it, create a patch for musl, add it to our package and submit it upstream, that would be nice. If you don't, we should fix this package anyway, so let's only patch our current version: https://github.com/falkTX/Carla/commit/3316618aa57346be5b0ab8667deab0dba7ba8c68.patch.

Re: Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[Animeshz]

[-- Attachment #1: Type: text/plain, Size: 165 bytes --]

New comment by Animeshz on void-packages repository

https://github.com/void-linux/void-packages/pull/33809#issuecomment-954904880

Comment:
Ok, might try tomorrow!

Re: Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 716 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33809#issuecomment-954922225

Comment:
~~whyyy~~

`__linux__` should work better than `__gnu_linux__` there, I didn't even know about `__gnu_linux__`.

https://github.com/falkTX/Carla/blob/25c61989de0cfe55e4ff62af002403c9acaa1bd6/source/modules/juce_core/system/juce_SystemStats.cpp#L141 change this to `#if 1`, we don't want built-in backtrace reporting.

https://github.com/falkTX/Carla/blob/25c61989de0cfe55e4ff62af002403c9acaa1bd6/source/modules/juce_core/juce_core.cpp#L95 remove this line entirely.

And please ask upstream to replace their hardcoded platform knowledge with a simple configure check.

Re: [PR PATCH] [Updated] Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[Animeshz]

[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]

There is an updated pull request by Animeshz against master on the void-packages repository

https://github.com/Animeshz/void-packages carla-update
https://github.com/void-linux/void-packages/pull/33809

Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)
Older version breaks on Python 3.10, see: falkTX/Carla#1489. PR simply bumps the version.

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [x] armv7l
  - [ ] armv6l-musl

A patch file from https://github.com/void-linux/void-packages/pull/33809.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-update-33809.patch --]
[-- Type: text/x-diff, Size: 6875 bytes --]

From 3e04a05b25efad579b81d6a32aac18f6451b11bd Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 17:55:43 +0530
Subject: [PATCH 1/4] Carla: update to 2.4.1 (with fix to non-explicit cast
 with Python3.10)

---
 srcpkgs/Carla/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 7ab456abe988..81e538623367 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,6 +1,6 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.1
+version=2.4.1
 revision=4
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
@@ -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=bbb188a672ea8871b11648d36770ba013497d03407ca9c73ed68429016f7536f
 python_version=3
 
 case $XBPS_TARGET_MACHINE in

From da0ecb93f475e7c173d463d34c92e3726196ca14 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 18:00:55 +0530
Subject: [PATCH 2/4] reverts revision to 1

---
 srcpkgs/Carla/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 81e538623367..9a4cd39bc647 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
 version=2.4.1
-revision=4
+revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"

From a2e1df43d35af0c92e3afd0c8ca66f48165c845f Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 18:30:05 +0530
Subject: [PATCH 3/4] remove already fixed patches in upstream

---
 srcpkgs/Carla/patches/libmagic.patch   | 14 --------------
 srcpkgs/Carla/patches/qt5-5.15.0.patch | 10 ----------
 2 files changed, 24 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 f116eadc68ce..000000000000
--- a/srcpkgs/Carla/patches/libmagic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/source/Makefile.mk
-+++ b/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 <magic.h>' | $(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 ed58b7f6e69e..000000000000
--- a/srcpkgs/Carla/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/source/theme/CarlaStyle.cpp	2020-04-13 05:29:06.000000000 +0200
-+++ b/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>

From ec18971d0f54ae3cd918778e489023345686244d Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Sat, 30 Oct 2021 09:34:50 +0530
Subject: [PATCH 4/4] fix musl build

---
 srcpkgs/Carla/patches/musl.patch | 73 ++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 srcpkgs/Carla/patches/musl.patch

diff --git a/srcpkgs/Carla/patches/musl.patch b/srcpkgs/Carla/patches/musl.patch
new file mode 100644
index 000000000000..7914395ba4e1
--- /dev/null
+++ b/srcpkgs/Carla/patches/musl.patch
@@ -0,0 +1,73 @@
+diff --git a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+index 3a9373893..6e1599345 100644
+--- a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
++++ b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+@@ -86,7 +86,7 @@
+ //-----------------------------------------------------------------------------
+ // LINUX
+ //-----------------------------------------------------------------------------
+-#elif __gnu_linux__
++#elif __linux__
+ 	#define SMTG_OS_LINUX	1
+ 	#define SMTG_OS_MACOS	0
+ 	#define SMTG_OS_WINDOWS	0
+diff --git a/source/modules/juce_core/juce_core.cpp b/source/modules/juce_core/juce_core.cpp
+index 914cae680..4b1f20b00 100644
+--- a/source/modules/juce_core/juce_core.cpp
++++ b/source/modules/juce_core/juce_core.cpp
+@@ -90,10 +90,6 @@
+  #include <sys/time.h>
+  #include <net/if.h>
+  #include <sys/ioctl.h>
+-
+- #if ! JUCE_ANDROID
+-  #include <execinfo.h>
+- #endif
+ #endif
+ 
+ #if JUCE_MAC || JUCE_IOS
+diff --git a/source/modules/juce_core/native/juce_linux_SystemStats.cpp b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+index cd3068e6e..607ed29c0 100644
+--- a/source/modules/juce_core/native/juce_linux_SystemStats.cpp
++++ b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+@@ -139,8 +139,24 @@ static String getLocaleValue (nl_item key)
+     return result;
+ }
+ 
+-String SystemStats::getUserLanguage()     { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); }
+-String SystemStats::getUserRegion()       { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); }
++String SystemStats::getUserLanguage()
++{
++#if defined(_NL_IDENTIFICATION_LANGUAGE)
++	return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE);
++#else
++	return "";
++#endif
++}
++
++String SystemStats::getUserRegion()
++{
++#if defined(_NL_IDENTIFICATION_TERRITORY)
++	return getLocaleValue (_NL_IDENTIFICATION_TERRITORY);
++#else
++	return "";
++#endif
++}
++
+ String SystemStats::getDisplayLanguage()  { return getUserLanguage() + "-" + getUserRegion(); }
+ 
+ //==============================================================================
+diff --git a/source/modules/juce_core/system/juce_SystemStats.cpp b/source/modules/juce_core/system/juce_SystemStats.cpp
+index 847127162..815ead97c 100644
+--- a/source/modules/juce_core/system/juce_SystemStats.cpp
++++ b/source/modules/juce_core/system/juce_SystemStats.cpp
+@@ -138,7 +138,8 @@ String SystemStats::getStackBacktrace()
+ {
+     String result;
+ 
+-   #if JUCE_ANDROID || JUCE_MINGW
++// #if JUCE_ANDROID || JUCE_MINGW
++   #if 1
+     jassertfalse; // sorry, not implemented yet!
+ 
+    #elif JUCE_WINDOWS

Re: Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[Animeshz]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by Animeshz on void-packages repository

https://github.com/void-linux/void-packages/pull/33809#issuecomment-955142197

Comment:
Done! Builds in x86_64-musl, haven't tried others (I have data caps).

Re: Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33809#issuecomment-955576338

Comment:
(please remember to squash commits)

Re: [PR PATCH] [Updated] Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[Animeshz]

[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]

There is an updated pull request by Animeshz against master on the void-packages repository

https://github.com/Animeshz/void-packages carla-update
https://github.com/void-linux/void-packages/pull/33809

Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)
Older version breaks on Python 3.10, see: falkTX/Carla#1489. PR simply bumps the version.

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [x] armv7l
  - [ ] armv6l-musl

A patch file from https://github.com/void-linux/void-packages/pull/33809.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-update-33809.patch --]
[-- Type: text/x-diff, Size: 5850 bytes --]

From 84c997da11e939976caa096cf5f0d9dff0d77055 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 17:55:43 +0530
Subject: [PATCH] Carla: update to 2.4.1 + rm fixed upstream patches + add musl
 patch

remove already fixed patches in upstream

fix musl build
---
 srcpkgs/Carla/patches/libmagic.patch   | 14 -----
 srcpkgs/Carla/patches/musl.patch       | 73 ++++++++++++++++++++++++++
 srcpkgs/Carla/patches/qt5-5.15.0.patch | 10 ----
 srcpkgs/Carla/template                 |  6 +--
 4 files changed, 76 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/Carla/patches/libmagic.patch
 create mode 100644 srcpkgs/Carla/patches/musl.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 f116eadc68ce..000000000000
--- a/srcpkgs/Carla/patches/libmagic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/source/Makefile.mk
-+++ b/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 <magic.h>' | $(CC) $(CFLAGS) -x c -w -c - -o .libmagic-tmp 2>/dev/null && echo true)
--
-+HAVE_LIBMAGIC = true
- endif
- 
- # ---------------------------------------------------------------------------------------------------------------------
diff --git a/srcpkgs/Carla/patches/musl.patch b/srcpkgs/Carla/patches/musl.patch
new file mode 100644
index 000000000000..7914395ba4e1
--- /dev/null
+++ b/srcpkgs/Carla/patches/musl.patch
@@ -0,0 +1,73 @@
+diff --git a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+index 3a9373893..6e1599345 100644
+--- a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
++++ b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+@@ -86,7 +86,7 @@
+ //-----------------------------------------------------------------------------
+ // LINUX
+ //-----------------------------------------------------------------------------
+-#elif __gnu_linux__
++#elif __linux__
+ 	#define SMTG_OS_LINUX	1
+ 	#define SMTG_OS_MACOS	0
+ 	#define SMTG_OS_WINDOWS	0
+diff --git a/source/modules/juce_core/juce_core.cpp b/source/modules/juce_core/juce_core.cpp
+index 914cae680..4b1f20b00 100644
+--- a/source/modules/juce_core/juce_core.cpp
++++ b/source/modules/juce_core/juce_core.cpp
+@@ -90,10 +90,6 @@
+  #include <sys/time.h>
+  #include <net/if.h>
+  #include <sys/ioctl.h>
+-
+- #if ! JUCE_ANDROID
+-  #include <execinfo.h>
+- #endif
+ #endif
+ 
+ #if JUCE_MAC || JUCE_IOS
+diff --git a/source/modules/juce_core/native/juce_linux_SystemStats.cpp b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+index cd3068e6e..607ed29c0 100644
+--- a/source/modules/juce_core/native/juce_linux_SystemStats.cpp
++++ b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+@@ -139,8 +139,24 @@ static String getLocaleValue (nl_item key)
+     return result;
+ }
+ 
+-String SystemStats::getUserLanguage()     { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); }
+-String SystemStats::getUserRegion()       { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); }
++String SystemStats::getUserLanguage()
++{
++#if defined(_NL_IDENTIFICATION_LANGUAGE)
++	return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE);
++#else
++	return "";
++#endif
++}
++
++String SystemStats::getUserRegion()
++{
++#if defined(_NL_IDENTIFICATION_TERRITORY)
++	return getLocaleValue (_NL_IDENTIFICATION_TERRITORY);
++#else
++	return "";
++#endif
++}
++
+ String SystemStats::getDisplayLanguage()  { return getUserLanguage() + "-" + getUserRegion(); }
+ 
+ //==============================================================================
+diff --git a/source/modules/juce_core/system/juce_SystemStats.cpp b/source/modules/juce_core/system/juce_SystemStats.cpp
+index 847127162..815ead97c 100644
+--- a/source/modules/juce_core/system/juce_SystemStats.cpp
++++ b/source/modules/juce_core/system/juce_SystemStats.cpp
+@@ -138,7 +138,8 @@ String SystemStats::getStackBacktrace()
+ {
+     String result;
+ 
+-   #if JUCE_ANDROID || JUCE_MINGW
++// #if JUCE_ANDROID || JUCE_MINGW
++   #if 1
+     jassertfalse; // sorry, not implemented yet!
+ 
+    #elif JUCE_WINDOWS
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 ed58b7f6e69e..000000000000
--- a/srcpkgs/Carla/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/source/theme/CarlaStyle.cpp	2020-04-13 05:29:06.000000000 +0200
-+++ b/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 7ab456abe988..9a4cd39bc647 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.1
-revision=4
+version=2.4.1
+revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"
@@ -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=bbb188a672ea8871b11648d36770ba013497d03407ca9c73ed68429016f7536f
 python_version=3
 
 case $XBPS_TARGET_MACHINE in

Re: [PR PATCH] [Updated] Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[Animeshz]

[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]

There is an updated pull request by Animeshz against master on the void-packages repository

https://github.com/Animeshz/void-packages carla-update
https://github.com/void-linux/void-packages/pull/33809

Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)
Older version breaks on Python 3.10, see: falkTX/Carla#1489. PR simply bumps the version.

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [x] armv7l
  - [ ] armv6l-musl

A patch file from https://github.com/void-linux/void-packages/pull/33809.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-update-33809.patch --]
[-- Type: text/x-diff, Size: 5850 bytes --]

From 76c2b555372f47047233a3cb380f5454c24def83 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 17:55:43 +0530
Subject: [PATCH] Carla: update to 2.4.1 + rm fixed upstream patches + add musl
 patch

remove already fixed patches in upstream

fix musl build
---
 srcpkgs/Carla/patches/libmagic.patch   | 14 -----
 srcpkgs/Carla/patches/musl.patch       | 73 ++++++++++++++++++++++++++
 srcpkgs/Carla/patches/qt5-5.15.0.patch | 10 ----
 srcpkgs/Carla/template                 |  6 +--
 4 files changed, 76 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/Carla/patches/libmagic.patch
 create mode 100644 srcpkgs/Carla/patches/musl.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 f116eadc68ce..000000000000
--- a/srcpkgs/Carla/patches/libmagic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/source/Makefile.mk
-+++ b/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 <magic.h>' | $(CC) $(CFLAGS) -x c -w -c - -o .libmagic-tmp 2>/dev/null && echo true)
--
-+HAVE_LIBMAGIC = true
- endif
- 
- # ---------------------------------------------------------------------------------------------------------------------
diff --git a/srcpkgs/Carla/patches/musl.patch b/srcpkgs/Carla/patches/musl.patch
new file mode 100644
index 000000000000..7914395ba4e1
--- /dev/null
+++ b/srcpkgs/Carla/patches/musl.patch
@@ -0,0 +1,73 @@
+diff --git a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+index 3a9373893..6e1599345 100644
+--- a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
++++ b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+@@ -86,7 +86,7 @@
+ //-----------------------------------------------------------------------------
+ // LINUX
+ //-----------------------------------------------------------------------------
+-#elif __gnu_linux__
++#elif __linux__
+ 	#define SMTG_OS_LINUX	1
+ 	#define SMTG_OS_MACOS	0
+ 	#define SMTG_OS_WINDOWS	0
+diff --git a/source/modules/juce_core/juce_core.cpp b/source/modules/juce_core/juce_core.cpp
+index 914cae680..4b1f20b00 100644
+--- a/source/modules/juce_core/juce_core.cpp
++++ b/source/modules/juce_core/juce_core.cpp
+@@ -90,10 +90,6 @@
+  #include <sys/time.h>
+  #include <net/if.h>
+  #include <sys/ioctl.h>
+-
+- #if ! JUCE_ANDROID
+-  #include <execinfo.h>
+- #endif
+ #endif
+ 
+ #if JUCE_MAC || JUCE_IOS
+diff --git a/source/modules/juce_core/native/juce_linux_SystemStats.cpp b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+index cd3068e6e..607ed29c0 100644
+--- a/source/modules/juce_core/native/juce_linux_SystemStats.cpp
++++ b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+@@ -139,8 +139,24 @@ static String getLocaleValue (nl_item key)
+     return result;
+ }
+ 
+-String SystemStats::getUserLanguage()     { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); }
+-String SystemStats::getUserRegion()       { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); }
++String SystemStats::getUserLanguage()
++{
++#if defined(_NL_IDENTIFICATION_LANGUAGE)
++	return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE);
++#else
++	return "";
++#endif
++}
++
++String SystemStats::getUserRegion()
++{
++#if defined(_NL_IDENTIFICATION_TERRITORY)
++	return getLocaleValue (_NL_IDENTIFICATION_TERRITORY);
++#else
++	return "";
++#endif
++}
++
+ String SystemStats::getDisplayLanguage()  { return getUserLanguage() + "-" + getUserRegion(); }
+ 
+ //==============================================================================
+diff --git a/source/modules/juce_core/system/juce_SystemStats.cpp b/source/modules/juce_core/system/juce_SystemStats.cpp
+index 847127162..815ead97c 100644
+--- a/source/modules/juce_core/system/juce_SystemStats.cpp
++++ b/source/modules/juce_core/system/juce_SystemStats.cpp
+@@ -138,7 +138,8 @@ String SystemStats::getStackBacktrace()
+ {
+     String result;
+ 
+-   #if JUCE_ANDROID || JUCE_MINGW
++// #if JUCE_ANDROID || JUCE_MINGW
++   #if 1
+     jassertfalse; // sorry, not implemented yet!
+ 
+    #elif JUCE_WINDOWS
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 ed58b7f6e69e..000000000000
--- a/srcpkgs/Carla/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/source/theme/CarlaStyle.cpp	2020-04-13 05:29:06.000000000 +0200
-+++ b/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 7ab456abe988..9a4cd39bc647 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.1
-revision=4
+version=2.4.1
+revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"
@@ -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=bbb188a672ea8871b11648d36770ba013497d03407ca9c73ed68429016f7536f
 python_version=3
 
 case $XBPS_TARGET_MACHINE in

Re: Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[Animeshz]

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

New comment by Animeshz on void-packages repository

https://github.com/void-linux/void-packages/pull/33809#issuecomment-955627326

Comment:
Rebased over the latest tip :+1:

Re: Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 412 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33809#issuecomment-967772270

Comment:
![image](https://user-images.githubusercontent.com/34201958/141604197-55bb56a6-afd7-4019-8e20-f6d34a5114c9.png)

It seems to be stuck continuously loading DSP and pressing the `New` button doesn't do anything.

Also, per  #23390, this is missing the liblo dependency.

Re: [PR PATCH] [Updated] Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[Animeshz]

[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]

There is an updated pull request by Animeshz against master on the void-packages repository

https://github.com/Animeshz/void-packages carla-update
https://github.com/void-linux/void-packages/pull/33809

Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)
Older version breaks on Python 3.10, see: falkTX/Carla#1489. PR simply bumps the version.

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [x] armv7l
  - [ ] armv6l-musl

A patch file from https://github.com/void-linux/void-packages/pull/33809.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-update-33809.patch --]
[-- Type: text/x-diff, Size: 7373 bytes --]

From b373c266782aeebd728a929fb1191a01c6a53e9c 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..47617417ed3e
--- /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 <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
+# Github CI fails with "testNoPermission (test.test_liblo.ServerCreationTestCase)"
+make_check=ci-skip

From cc2b646e0ecf0a5eff7acdbb0067a10f2f15bcd3 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 17:55:43 +0530
Subject: [PATCH 2/2] Carla: update to 2.4.1 + rm fixed upstream patches + add
 musl patch + add depends pyliblo

---
 srcpkgs/Carla/patches/libmagic.patch   | 14 -----
 srcpkgs/Carla/patches/musl.patch       | 73 ++++++++++++++++++++++++++
 srcpkgs/Carla/patches/qt5-5.15.0.patch | 10 ----
 srcpkgs/Carla/template                 |  8 +--
 4 files changed, 77 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/Carla/patches/libmagic.patch
 create mode 100644 srcpkgs/Carla/patches/musl.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 f116eadc68ce..000000000000
--- a/srcpkgs/Carla/patches/libmagic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/source/Makefile.mk
-+++ b/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 <magic.h>' | $(CC) $(CFLAGS) -x c -w -c - -o .libmagic-tmp 2>/dev/null && echo true)
--
-+HAVE_LIBMAGIC = true
- endif
- 
- # ---------------------------------------------------------------------------------------------------------------------
diff --git a/srcpkgs/Carla/patches/musl.patch b/srcpkgs/Carla/patches/musl.patch
new file mode 100644
index 000000000000..7914395ba4e1
--- /dev/null
+++ b/srcpkgs/Carla/patches/musl.patch
@@ -0,0 +1,73 @@
+diff --git a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+index 3a9373893..6e1599345 100644
+--- a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
++++ b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+@@ -86,7 +86,7 @@
+ //-----------------------------------------------------------------------------
+ // LINUX
+ //-----------------------------------------------------------------------------
+-#elif __gnu_linux__
++#elif __linux__
+ 	#define SMTG_OS_LINUX	1
+ 	#define SMTG_OS_MACOS	0
+ 	#define SMTG_OS_WINDOWS	0
+diff --git a/source/modules/juce_core/juce_core.cpp b/source/modules/juce_core/juce_core.cpp
+index 914cae680..4b1f20b00 100644
+--- a/source/modules/juce_core/juce_core.cpp
++++ b/source/modules/juce_core/juce_core.cpp
+@@ -90,10 +90,6 @@
+  #include <sys/time.h>
+  #include <net/if.h>
+  #include <sys/ioctl.h>
+-
+- #if ! JUCE_ANDROID
+-  #include <execinfo.h>
+- #endif
+ #endif
+ 
+ #if JUCE_MAC || JUCE_IOS
+diff --git a/source/modules/juce_core/native/juce_linux_SystemStats.cpp b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+index cd3068e6e..607ed29c0 100644
+--- a/source/modules/juce_core/native/juce_linux_SystemStats.cpp
++++ b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+@@ -139,8 +139,24 @@ static String getLocaleValue (nl_item key)
+     return result;
+ }
+ 
+-String SystemStats::getUserLanguage()     { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); }
+-String SystemStats::getUserRegion()       { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); }
++String SystemStats::getUserLanguage()
++{
++#if defined(_NL_IDENTIFICATION_LANGUAGE)
++	return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE);
++#else
++	return "";
++#endif
++}
++
++String SystemStats::getUserRegion()
++{
++#if defined(_NL_IDENTIFICATION_TERRITORY)
++	return getLocaleValue (_NL_IDENTIFICATION_TERRITORY);
++#else
++	return "";
++#endif
++}
++
+ String SystemStats::getDisplayLanguage()  { return getUserLanguage() + "-" + getUserRegion(); }
+ 
+ //==============================================================================
+diff --git a/source/modules/juce_core/system/juce_SystemStats.cpp b/source/modules/juce_core/system/juce_SystemStats.cpp
+index 847127162..815ead97c 100644
+--- a/source/modules/juce_core/system/juce_SystemStats.cpp
++++ b/source/modules/juce_core/system/juce_SystemStats.cpp
+@@ -138,7 +138,8 @@ String SystemStats::getStackBacktrace()
+ {
+     String result;
+ 
+-   #if JUCE_ANDROID || JUCE_MINGW
++// #if JUCE_ANDROID || JUCE_MINGW
++   #if 1
+     jassertfalse; // sorry, not implemented yet!
+ 
+    #elif JUCE_WINDOWS
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 ed58b7f6e69e..000000000000
--- a/srcpkgs/Carla/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/source/theme/CarlaStyle.cpp	2020-04-13 05:29:06.000000000 +0200
-+++ b/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 7ab456abe988..1562e0fb20e4 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.1
-revision=4
+version=2.4.1
+revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"
@@ -10,13 +10,13 @@ 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"
 homepage="https://kxstudio.linuxaudio.org/Applications:Carla"
 distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
-checksum=a82ce08f3a82db9d878c8cb7e7e2f3b80834bf21801c6ec4ed95c0cfee25b963
+checksum=bbb188a672ea8871b11648d36770ba013497d03407ca9c73ed68429016f7536f
 python_version=3
 
 case $XBPS_TARGET_MACHINE in

Re: [PR PATCH] [Updated] Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[Animeshz]

[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]

There is an updated pull request by Animeshz against master on the void-packages repository

https://github.com/Animeshz/void-packages carla-update
https://github.com/void-linux/void-packages/pull/33809

Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)
Older version breaks on Python 3.10, see: falkTX/Carla#1489. PR simply bumps the version.

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [x] armv7l
  - [ ] armv6l-musl

A patch file from https://github.com/void-linux/void-packages/pull/33809.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-update-33809.patch --]
[-- Type: text/x-diff, Size: 7373 bytes --]

From b373c266782aeebd728a929fb1191a01c6a53e9c 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..47617417ed3e
--- /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 <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
+# Github CI fails with "testNoPermission (test.test_liblo.ServerCreationTestCase)"
+make_check=ci-skip

From 097a173cf2c8268f7e82c316c64b125b0bb82332 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 17:55:43 +0530
Subject: [PATCH 2/2] Carla: update to 2.4.1 + rm fixed upstream patches + add
 musl patch

+ add depends pyliblo
---
 srcpkgs/Carla/patches/libmagic.patch   | 14 -----
 srcpkgs/Carla/patches/musl.patch       | 73 ++++++++++++++++++++++++++
 srcpkgs/Carla/patches/qt5-5.15.0.patch | 10 ----
 srcpkgs/Carla/template                 |  8 +--
 4 files changed, 77 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/Carla/patches/libmagic.patch
 create mode 100644 srcpkgs/Carla/patches/musl.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 f116eadc68ce..000000000000
--- a/srcpkgs/Carla/patches/libmagic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/source/Makefile.mk
-+++ b/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 <magic.h>' | $(CC) $(CFLAGS) -x c -w -c - -o .libmagic-tmp 2>/dev/null && echo true)
--
-+HAVE_LIBMAGIC = true
- endif
- 
- # ---------------------------------------------------------------------------------------------------------------------
diff --git a/srcpkgs/Carla/patches/musl.patch b/srcpkgs/Carla/patches/musl.patch
new file mode 100644
index 000000000000..7914395ba4e1
--- /dev/null
+++ b/srcpkgs/Carla/patches/musl.patch
@@ -0,0 +1,73 @@
+diff --git a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+index 3a9373893..6e1599345 100644
+--- a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
++++ b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+@@ -86,7 +86,7 @@
+ //-----------------------------------------------------------------------------
+ // LINUX
+ //-----------------------------------------------------------------------------
+-#elif __gnu_linux__
++#elif __linux__
+ 	#define SMTG_OS_LINUX	1
+ 	#define SMTG_OS_MACOS	0
+ 	#define SMTG_OS_WINDOWS	0
+diff --git a/source/modules/juce_core/juce_core.cpp b/source/modules/juce_core/juce_core.cpp
+index 914cae680..4b1f20b00 100644
+--- a/source/modules/juce_core/juce_core.cpp
++++ b/source/modules/juce_core/juce_core.cpp
+@@ -90,10 +90,6 @@
+  #include <sys/time.h>
+  #include <net/if.h>
+  #include <sys/ioctl.h>
+-
+- #if ! JUCE_ANDROID
+-  #include <execinfo.h>
+- #endif
+ #endif
+ 
+ #if JUCE_MAC || JUCE_IOS
+diff --git a/source/modules/juce_core/native/juce_linux_SystemStats.cpp b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+index cd3068e6e..607ed29c0 100644
+--- a/source/modules/juce_core/native/juce_linux_SystemStats.cpp
++++ b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+@@ -139,8 +139,24 @@ static String getLocaleValue (nl_item key)
+     return result;
+ }
+ 
+-String SystemStats::getUserLanguage()     { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); }
+-String SystemStats::getUserRegion()       { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); }
++String SystemStats::getUserLanguage()
++{
++#if defined(_NL_IDENTIFICATION_LANGUAGE)
++	return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE);
++#else
++	return "";
++#endif
++}
++
++String SystemStats::getUserRegion()
++{
++#if defined(_NL_IDENTIFICATION_TERRITORY)
++	return getLocaleValue (_NL_IDENTIFICATION_TERRITORY);
++#else
++	return "";
++#endif
++}
++
+ String SystemStats::getDisplayLanguage()  { return getUserLanguage() + "-" + getUserRegion(); }
+ 
+ //==============================================================================
+diff --git a/source/modules/juce_core/system/juce_SystemStats.cpp b/source/modules/juce_core/system/juce_SystemStats.cpp
+index 847127162..815ead97c 100644
+--- a/source/modules/juce_core/system/juce_SystemStats.cpp
++++ b/source/modules/juce_core/system/juce_SystemStats.cpp
+@@ -138,7 +138,8 @@ String SystemStats::getStackBacktrace()
+ {
+     String result;
+ 
+-   #if JUCE_ANDROID || JUCE_MINGW
++// #if JUCE_ANDROID || JUCE_MINGW
++   #if 1
+     jassertfalse; // sorry, not implemented yet!
+ 
+    #elif JUCE_WINDOWS
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 ed58b7f6e69e..000000000000
--- a/srcpkgs/Carla/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/source/theme/CarlaStyle.cpp	2020-04-13 05:29:06.000000000 +0200
-+++ b/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 7ab456abe988..1562e0fb20e4 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.1
-revision=4
+version=2.4.1
+revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"
@@ -10,13 +10,13 @@ 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"
 homepage="https://kxstudio.linuxaudio.org/Applications:Carla"
 distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
-checksum=a82ce08f3a82db9d878c8cb7e7e2f3b80834bf21801c6ec4ed95c0cfee25b963
+checksum=bbb188a672ea8871b11648d36770ba013497d03407ca9c73ed68429016f7536f
 python_version=3
 
 case $XBPS_TARGET_MACHINE in

Re: Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33809#issuecomment-968120894

Comment:
> It seems to be stuck continuously loading DSP and pressing the New button doesn't do anything.

Does this happen for you? Any tips on what to investigate? I don't know if it's because I'm on musl...

Re: Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[Oreo639]

[-- Attachment #1: Type: text/plain, Size: 942 bytes --]

New comment by Oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/33809#issuecomment-986476885

Comment:
> > It seems to be stuck continuously loading DSP and pressing the New button doesn't do anything.
> 
> Does this happen for you? Any tips on what to investigate? I don't know if it's because I'm on musl...

Sorry if I am missing something but `DSP load` is not for "loading DSP", but is just an indicator of how much time the last frame took over the maximum amount of time available based on the sample rate and buffer size:
https://github.com/falkTX/Carla/blob/94139f07b176a5e12c7dab2e19251401c4a1461f/source/backend/engine/CarlaEngineInternal.cpp#L717-L739
As for the "new" button. That just resets the rack. If there are no plugins/VSTs loaded, then nothing will appear:
https://github.com/falkTX/Carla/blob/25c61989de0cfe55e4ff62af002403c9acaa1bd6/source/frontend/carla_host.py#L858-L867 

Re: Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[Oreo639]

[-- Attachment #1: Type: text/plain, Size: 941 bytes --]

New comment by Oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/33809#issuecomment-986476885

Comment:
> > It seems to be stuck continuously loading DSP and pressing the New button doesn't do anything.
> 
> Does this happen for you? Any tips on what to investigate? I don't know if it's because I'm on musl...

Sorry if I am missing something but `DSP load` is not for "loading DSP", but is just an indicator of how much time the last frame took over the maximum amount of time available based on the sample rate and buffer size:
https://github.com/falkTX/Carla/blob/94139f07b176a5e12c7dab2e19251401c4a1461f/source/backend/engine/CarlaEngineInternal.cpp#L717-L739
As for the "new" button. That just resets the rack. If there are no plugins/VSTs loaded, then it will do nothing:
https://github.com/falkTX/Carla/blob/25c61989de0cfe55e4ff62af002403c9acaa1bd6/source/frontend/carla_host.py#L858-L867 

Re: Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33809#issuecomment-986848190

Comment:
This is why I was asking :)

Good to know it isn't broken, I will try to merge this soon.

Re: [PR PATCH] [Updated] Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1078 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/Animeshz/void-packages carla-update
https://github.com/void-linux/void-packages/pull/33809

Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)
Older version breaks on Python 3.10, see: falkTX/Carla#1489. PR simply bumps the version.

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [x] armv7l
  - [ ] armv6l-musl

A patch file from https://github.com/void-linux/void-packages/pull/33809.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-carla-update-33809.patch --]
[-- Type: text/x-diff, Size: 7447 bytes --]

From 3e8c788149126d5cc5c59141b77f8f9e05bf559b 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.

Needed for Carla's carla-control program.
---
 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..d83804d7c05c
--- /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"
+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
+make_check=ci-skip # fails "test.test_liblo.ServerCreationTestCase" due to root

From e0e317dfa83458eaf9e46797767449840b8e306f Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 29 Oct 2021 17:55:43 +0530
Subject: [PATCH 2/2] Carla: update to 2.4.1.

musl patch: we disable backtrace functionality unconditionally.

Add pyliblo to depends to fix the carla-control program.
---
 srcpkgs/Carla/patches/libmagic.patch   | 14 -----
 srcpkgs/Carla/patches/musl.patch       | 73 ++++++++++++++++++++++++++
 srcpkgs/Carla/patches/qt5-5.15.0.patch | 10 ----
 srcpkgs/Carla/template                 |  8 +--
 4 files changed, 77 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/Carla/patches/libmagic.patch
 create mode 100644 srcpkgs/Carla/patches/musl.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 f116eadc68ce..000000000000
--- a/srcpkgs/Carla/patches/libmagic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/source/Makefile.mk
-+++ b/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 <magic.h>' | $(CC) $(CFLAGS) -x c -w -c - -o .libmagic-tmp 2>/dev/null && echo true)
--
-+HAVE_LIBMAGIC = true
- endif
- 
- # ---------------------------------------------------------------------------------------------------------------------
diff --git a/srcpkgs/Carla/patches/musl.patch b/srcpkgs/Carla/patches/musl.patch
new file mode 100644
index 000000000000..7914395ba4e1
--- /dev/null
+++ b/srcpkgs/Carla/patches/musl.patch
@@ -0,0 +1,73 @@
+diff --git a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+index 3a9373893..6e1599345 100644
+--- a/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
++++ b/source/includes/vst3sdk/pluginterfaces/base/fplatform.h
+@@ -86,7 +86,7 @@
+ //-----------------------------------------------------------------------------
+ // LINUX
+ //-----------------------------------------------------------------------------
+-#elif __gnu_linux__
++#elif __linux__
+ 	#define SMTG_OS_LINUX	1
+ 	#define SMTG_OS_MACOS	0
+ 	#define SMTG_OS_WINDOWS	0
+diff --git a/source/modules/juce_core/juce_core.cpp b/source/modules/juce_core/juce_core.cpp
+index 914cae680..4b1f20b00 100644
+--- a/source/modules/juce_core/juce_core.cpp
++++ b/source/modules/juce_core/juce_core.cpp
+@@ -90,10 +90,6 @@
+  #include <sys/time.h>
+  #include <net/if.h>
+  #include <sys/ioctl.h>
+-
+- #if ! JUCE_ANDROID
+-  #include <execinfo.h>
+- #endif
+ #endif
+ 
+ #if JUCE_MAC || JUCE_IOS
+diff --git a/source/modules/juce_core/native/juce_linux_SystemStats.cpp b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+index cd3068e6e..607ed29c0 100644
+--- a/source/modules/juce_core/native/juce_linux_SystemStats.cpp
++++ b/source/modules/juce_core/native/juce_linux_SystemStats.cpp
+@@ -139,8 +139,24 @@ static String getLocaleValue (nl_item key)
+     return result;
+ }
+ 
+-String SystemStats::getUserLanguage()     { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); }
+-String SystemStats::getUserRegion()       { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); }
++String SystemStats::getUserLanguage()
++{
++#if defined(_NL_IDENTIFICATION_LANGUAGE)
++	return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE);
++#else
++	return "";
++#endif
++}
++
++String SystemStats::getUserRegion()
++{
++#if defined(_NL_IDENTIFICATION_TERRITORY)
++	return getLocaleValue (_NL_IDENTIFICATION_TERRITORY);
++#else
++	return "";
++#endif
++}
++
+ String SystemStats::getDisplayLanguage()  { return getUserLanguage() + "-" + getUserRegion(); }
+ 
+ //==============================================================================
+diff --git a/source/modules/juce_core/system/juce_SystemStats.cpp b/source/modules/juce_core/system/juce_SystemStats.cpp
+index 847127162..815ead97c 100644
+--- a/source/modules/juce_core/system/juce_SystemStats.cpp
++++ b/source/modules/juce_core/system/juce_SystemStats.cpp
+@@ -138,7 +138,8 @@ String SystemStats::getStackBacktrace()
+ {
+     String result;
+ 
+-   #if JUCE_ANDROID || JUCE_MINGW
++// #if JUCE_ANDROID || JUCE_MINGW
++   #if 1
+     jassertfalse; // sorry, not implemented yet!
+ 
+    #elif JUCE_WINDOWS
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 ed58b7f6e69e..000000000000
--- a/srcpkgs/Carla/patches/qt5-5.15.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/source/theme/CarlaStyle.cpp	2020-04-13 05:29:06.000000000 +0200
-+++ b/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 7ab456abe988..1562e0fb20e4 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,7 +1,7 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.1
-revision=4
+version=2.4.1
+revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
 pycompile_dirs="usr/share/carla"
@@ -10,13 +10,13 @@ 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"
 homepage="https://kxstudio.linuxaudio.org/Applications:Carla"
 distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
-checksum=a82ce08f3a82db9d878c8cb7e7e2f3b80834bf21801c6ec4ed95c0cfee25b963
+checksum=bbb188a672ea8871b11648d36770ba013497d03407ca9c73ed68429016f7536f
 python_version=3
 
 case $XBPS_TARGET_MACHINE in

Re: [PR PATCH] [Merged]: Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 916 bytes --]

There's a merged pull request on the void-packages repository

Carla: update to 2.4.1 (with fix to non-explicit cast with Python3.10)
https://github.com/void-linux/void-packages/pull/33809

Description:
Older version breaks on Python 3.10, see: falkTX/Carla#1489. PR simply bumps the version.

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [x] armv7l
  - [ ] armv6l-musl