From: Calandracas606 <Calandracas606@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] lsp-plugins: update to 1.2.19, enable cross build.
Date: Mon, 14 Oct 2024 22:02:54 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-52640@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1554 bytes --]
There is a new pull request by Calandracas606 against master on the void-packages repository
https://github.com/Calandracas606/void-packages lsp-plugins
https://github.com/void-linux/void-packages/pull/52640
lsp-plugins: update to 1.2.19, enable cross build.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- x86_64-musl
- i686
- aarch64 (cross)
- aarch64-musl (cross)
- armv7l (cross)
- armv7l-musl (cross)
- armv6l (cross)
- armv6l-musl (cross)
patch submitted upstream: https://github.com/lsp-plugins/lsp-common-lib/pull/1
Also relevant for: https://github.com/void-linux/void-packages/pull/39796
A patch file from https://github.com/void-linux/void-packages/pull/52640.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lsp-plugins-52640.patch --]
[-- Type: text/x-diff, Size: 6134 bytes --]
From b0498e7072b0cfc7e3c8e835dac29b9ee13ff727 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Mon, 14 Oct 2024 15:54:23 -0400
Subject: [PATCH] lsp-plugins: update to 1.2.19, enable cross build.
---
srcpkgs/lsp-plugins-gst | 1 +
srcpkgs/lsp-plugins-vst3 | 1 +
srcpkgs/lsp-plugins/patches/musl-locale.patch | 42 +++++++++++++
srcpkgs/lsp-plugins/template | 60 ++++++++++++++++---
4 files changed, 97 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/lsp-plugins-gst
create mode 120000 srcpkgs/lsp-plugins-vst3
create mode 100644 srcpkgs/lsp-plugins/patches/musl-locale.patch
diff --git a/srcpkgs/lsp-plugins-gst b/srcpkgs/lsp-plugins-gst
new file mode 120000
index 00000000000000..f59057b0c7f794
--- /dev/null
+++ b/srcpkgs/lsp-plugins-gst
@@ -0,0 +1 @@
+lsp-plugins
\ No newline at end of file
diff --git a/srcpkgs/lsp-plugins-vst3 b/srcpkgs/lsp-plugins-vst3
new file mode 120000
index 00000000000000..f59057b0c7f794
--- /dev/null
+++ b/srcpkgs/lsp-plugins-vst3
@@ -0,0 +1 @@
+lsp-plugins
\ No newline at end of file
diff --git a/srcpkgs/lsp-plugins/patches/musl-locale.patch b/srcpkgs/lsp-plugins/patches/musl-locale.patch
new file mode 100644
index 00000000000000..81487a33b95989
--- /dev/null
+++ b/srcpkgs/lsp-plugins/patches/musl-locale.patch
@@ -0,0 +1,42 @@
+commit f9f6c1f06adc9ce261a46e1d747f1f95f5b319e7
+Author: Daniel Martinez <danielmartinez@cock.li>
+Date: Mon Oct 14 15:25:09 2024 -0400
+
+ Add checks around locales
+
+ With musl libc, many of the locale macros are not defined, causing build
+ errors
+
+ Check that the macros are defined before using them
+
+diff --git a/src/main/locale.cpp b/src/main/locale.cpp
+index 69ea619..5d9ab2e 100644
+--- a/modules/lsp-common-lib/src/main/locale.cpp
++++ b/modules/lsp-common-lib/src/main/locale.cpp
+@@ -40,14 +40,24 @@ namespace lsp
+ case LC_MONETARY: flags = LC_MONETARY_MASK; break;
+ case LC_MESSAGES: flags = LC_MESSAGES_MASK; break;
+ case LC_ALL: flags = LC_ALL_MASK; break;
+- #if defined(PLATFORM_LINUX)
++ #if defined(LC_PAPER) && defined(LC_PAPER_MASK)
+ case LC_PAPER: flags = LC_PAPER_MASK; break;
++ #endif
++ #if defined(LC_NAME) && defined(LC_NAME_MASK)
+ case LC_NAME: flags = LC_NAME_MASK; break;
++ #endif
++ #if defined(LC_ADDRESS) && defined(LC_ADDRESS_MASK)
+ case LC_ADDRESS: flags = LC_ADDRESS_MASK; break;
++ #endif
++ #if defined(LC_TELEPHONE) && defined(LC_TELEPHONE_MASK)
+ case LC_TELEPHONE: flags = LC_TELEPHONE_MASK; break;
++ #endif
++ #if defined(LC_MEASUREMENT) && defined(LC_MEASUREMENT_MASK)
+ case LC_MEASUREMENT: flags = LC_MEASUREMENT_MASK; break;
++ #endif
++ #if defined(LC_IDENTIFICATION) && defined(LC_IDENTIFICATION)
+ case LC_IDENTIFICATION: flags = LC_IDENTIFICATION_MASK; break;
+- #endif /* PLATFORM_LINUX */
++ #endif
+
+ default:
+ return INVALID_LOCALE;
diff --git a/srcpkgs/lsp-plugins/template b/srcpkgs/lsp-plugins/template
index 40dce0617d9dfb..b036e83bad4a7b 100644
--- a/srcpkgs/lsp-plugins/template
+++ b/srcpkgs/lsp-plugins/template
@@ -1,26 +1,55 @@
# Template file for 'lsp-plugins'
pkgname=lsp-plugins
-version=1.2.14
-revision=2
+version=1.2.19
+revision=1
build_style=gnu-makefile
make_use_env=yes
make_build_args="VERBOSE=0"
hostmakedepends="pkg-config php lv2"
makedepends="lv2 libglvnd-devel jack-devel libsndfile-devel
- libXrandr-devel cairo-devel freetype-devel"
+ libXrandr-devel cairo-devel freetype-devel gst-plugins-base1-devel"
depends="lsp-plugins-libs lsp-plugins-xdg
- lsp-plugins-clap lsp-plugins-ladspa lsp-plugins-lv2 lsp-plugins-vst2"
+ lsp-plugins-clap lsp-plugins-ladspa lsp-plugins-lv2 lsp-plugins-vst2
+ lsp-plugins-gst lsp-plugins-vst3"
short_desc="Collection of open-source audio plugins for studios"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://lsp-plug.in/"
changelog="https://raw.githubusercontent.com/sadko4u/lsp-plugins/master/CHANGELOG"
distfiles="https://github.com/sadko4u/lsp-plugins/releases/download/$version/lsp-plugins-src-${version}.tar.gz"
-checksum=1a3359ee8b8a82971bd7e9eeabe43f58ce6b4a4793d85fb16f97b100e4edee9a
-nocross="Build system doesn't support cross-compilation properly"
+checksum=f0536d790fada3d896670683b71a2916a7bef55a2395f314370015535ec8d959
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" ${makedepends}"
+fi
do_configure() {
- make LD="$CXX" PREFIX=/usr config
+ if [ "$CROSS_BUILD" ]; then
+ make config \
+ LD="$CXX" \
+ PREFIX="/usr" \
+ HOST_CC="cc" \
+ HOST_CXX="g++" \
+ HOST_LD="g++" \
+ ARCHITECTURE="XBPS_TARGET_MACHINE" \
+ CROSS_COMPILE="1" \
+ HOST_ARCHITECTURE_CXXFLAGS="$XBPS_CXXFLAGS" \
+ HOST_ARCHITECTURE_CFLAGS="$XBPS_CFLAGS" \
+ HOST_ARCHITECTURE_LDFLAGS="$XBPS_LDFLAGS" \
+ ARCHITECTURE_CXXFLAGS="$CXXFLAGS" \
+ ARCHITECTURE_CFLAGS="$CFLAGS" \
+ ARCHITECTURE_LDFLAGS="$LDFLAGS"
+ else
+ make config \
+ LD="$CXX" \
+ PREFIX="/usr" \
+ HOST_ARCHITECTURE_CXXFLAGS="$CXXFLAGS" \
+ HOST_ARCHITECTURE_CFLAGS="$CFLAGS" \
+ HOST_ARCHITECTURE_LDFLAGS="$LDFLAGS" \
+ ARCHITECTURE_CXXFLAGS="$CXXFLAGS" \
+ ARCHITECTURE_CFLAGS="$CFLAGS" \
+ ARCHITECTURE_LDFLAGS="$LDFLAGS"
+ fi
}
lsp-plugins-libs_package() {
@@ -73,6 +102,23 @@ lsp-plugins-vst2_package() {
}
}
+lsp-plugins-gst_package() {
+ short_desc+=" - gst plugins"
+ depends="${sourcepkg}-libs>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/lib/gstreamer-1.0
+ vmove usr/lib/lsp-plugins/liblsp-plugins-gstreamer*.so
+ }
+}
+
+lsp-plugins-vst3_package() {
+ short_desc+=" - vst3 plugins"
+ depends="${sourcepkg}-libs>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/lib/vst3
+ }
+}
+
lsp-plugins-doc_package() {
short_desc+=" - documentation"
pkg_install() {
next reply other threads:[~2024-10-14 20:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-14 20:02 Calandracas606 [this message]
2024-10-14 20:06 ` [PR PATCH] [Updated] " Calandracas606
2024-10-15 2:17 ` [PR REVIEW] " classabbyamp
2024-10-15 2:18 ` classabbyamp
2024-10-15 2:41 ` [PR PATCH] [Updated] " Calandracas606
2024-10-15 2:42 ` [PR REVIEW] " Calandracas606
2024-10-16 22:53 ` Calandracas606
2024-10-17 13:35 ` dkwo
2024-10-17 14:20 ` dkwo
2024-10-17 15:24 ` Calandracas606
2024-10-19 20:22 ` dkwo
2024-10-19 20:24 ` classabbyamp
2024-10-19 22:31 ` dkwo
2024-10-20 18:09 ` dkwo
2024-11-09 15:50 ` dkwo
2024-11-11 22:11 ` [PR PATCH] [Updated] " Calandracas606
2024-11-11 22:14 ` Calandracas606
2024-11-11 23:02 ` [PR PATCH] [Merged]: " classabbyamp
2024-11-13 14:18 ` dkwo
2024-11-13 21:21 ` classabbyamp
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-52640@inbox.vuxu.org \
--to=calandracas606@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).