* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
@ 2022-09-27 0:14 ` ajtcode71
2022-10-01 7:51 ` ajtcode71
` (33 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-09-27 0:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 1883 bytes --]
From 9218ca4819afef0b48d53632859922f4b3eddec5 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Mon, 26 Sep 2022 18:05:45 +1000
Subject: [PATCH] New package: yabridge-4.0.2
---
srcpkgs/yabridge/template | 40 +++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..1d24b17ccdcf
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,40 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+## grep added due to void chroot grep being v3.7 which doesnt support
+## perl regex. grep package is v3.8 which supports the software maintainers
+## scripts.
+hostmakedepends="ninja pkg-config cmake grep git gcc-multilib"
+makedepends="wine-tools wine-devel wine-devel-32bit libxcb-devel libxcb-devel-32bit"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 -Dbitbridge=true
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vbin yabridge-host-32.exe.so
+ vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
2022-09-27 0:14 ` [PR PATCH] [Updated] " ajtcode71
@ 2022-10-01 7:51 ` ajtcode71
2022-10-01 8:47 ` [PR PATCH] [Updated] " ajtcode71
` (32 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-01 7:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 993 bytes --]
New comment by ajtcode71 on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#issuecomment-1264280272
Comment:
yabridge does not compile for i686 and x86_64-musl fails with following error:
/builddir/yabridge-4.0.2/build/../src/plugin/../common/utils.cpp:65:69: warning: missing initializer for member 'sched_param::__reserved3' [-Wmissing-field-initializers]
/builddir/yabridge-4.0.2/build/../src/plugin/../common/utils.cpp: In function 'std::optional<long long unsigned int> get_rttime_limit()':
/builddir/yabridge-4.0.2/build/../src/plugin/../common/utils.cpp:81:19: error: 'RLIMIT_RTTIME' was not declared in this scope; did you mean 'RLIMIT_NOFILE'?
81 | if (getrlimit(RLIMIT_RTTIME, &limits) == 0) {
| ^~~~~~~~~~~~~
| RLIMIT_NOFILE
/builddir/yabridge-4.0.2/build/../src/plugin/../common/utils.cpp:86:1: warning: control reaches end of non-void function [-Wreturn-type]
86 | }
| ^
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
2022-09-27 0:14 ` [PR PATCH] [Updated] " ajtcode71
2022-10-01 7:51 ` ajtcode71
@ 2022-10-01 8:47 ` ajtcode71
2022-10-01 10:57 ` [PR REVIEW] " paper42
` (31 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-01 8:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 1978 bytes --]
From 9d143a6a5cc66396b35f9910b24b4e940075a079 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Mon, 26 Sep 2022 18:05:45 +1000
Subject: [PATCH] New package: yabridge-4.0.2
---
srcpkgs/yabridge/template | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..192e7bb2d590
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,39 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+hostmakedepends="ninja pkg-config cmake grep git $(vopt_if with_32bit "gcc-multilib")"
+makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+depends="wine $(vopt_if with_32bit "wine-32bit")"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options="with_32bit"
+build_options_default="with_32bit"
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (2 preceding siblings ...)
2022-10-01 8:47 ` [PR PATCH] [Updated] " ajtcode71
@ 2022-10-01 10:57 ` paper42
2022-10-01 21:27 ` ajtcode71
` (30 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: paper42 @ 2022-10-01 10:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#discussion_r985085216
Comment:
https://github.com/void-linux/void-packages/pull/39575#discussion_r985083246
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (3 preceding siblings ...)
2022-10-01 10:57 ` [PR REVIEW] " paper42
@ 2022-10-01 21:27 ` ajtcode71
2022-10-01 21:32 ` paper42
` (29 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-01 21:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 566 bytes --]
New review comment by ajtcode71 on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#discussion_r985146665
Comment:
grep is required as the chroot-grep causes the following error:
ompiler stderr:
Running command: /usr/bin/sh -c wine --version | grep --only-matching -P '[0-9]+\.[0-9]+' | head -n1
--- stdout ---
--- stderr ---
grep: Perl matching not supported in a --disable-perl-regexp build
grep is version 3.8 has has perl-regexp enabled so the build works.
I moved grep from hostmakedepends to make depends.
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (4 preceding siblings ...)
2022-10-01 21:27 ` ajtcode71
@ 2022-10-01 21:32 ` paper42
2022-10-01 21:32 ` paper42
` (28 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: paper42 @ 2022-10-01 21:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#discussion_r985146986
Comment:
hostmakedepends is correct here, but we can't have grep there currently anyway
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (5 preceding siblings ...)
2022-10-01 21:32 ` paper42
@ 2022-10-01 21:32 ` paper42
2022-10-01 21:34 ` [PR PATCH] [Updated] " ajtcode71
` (27 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: paper42 @ 2022-10-01 21:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#discussion_r985146986
Comment:
hostmakedepends is correct here, but we can't currently have grep in build dependencies
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (6 preceding siblings ...)
2022-10-01 21:32 ` paper42
@ 2022-10-01 21:34 ` ajtcode71
2022-10-01 21:34 ` ajtcode71
` (26 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-01 21:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 3246 bytes --]
From 9d143a6a5cc66396b35f9910b24b4e940075a079 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Mon, 26 Sep 2022 18:05:45 +1000
Subject: [PATCH 1/2] New package: yabridge-4.0.2
---
srcpkgs/yabridge/template | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..192e7bb2d590
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,39 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+hostmakedepends="ninja pkg-config cmake grep git $(vopt_if with_32bit "gcc-multilib")"
+makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+depends="wine $(vopt_if with_32bit "wine-32bit")"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options="with_32bit"
+build_options_default="with_32bit"
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
From 69d07eb22ee77094b9647485e25791be0adc7448 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sun, 2 Oct 2022 08:33:26 +1100
Subject: [PATCH 2/2] add comment. add grep to makedepends
---
srcpkgs/yabridge/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
index 192e7bb2d590..a49c8eff226c 100644
--- a/srcpkgs/yabridge/template
+++ b/srcpkgs/yabridge/template
@@ -4,8 +4,9 @@ version=4.0.2
revision=1
archs="x86_64"
build_style=meson
-hostmakedepends="ninja pkg-config cmake grep git $(vopt_if with_32bit "gcc-multilib")"
-makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+## chroot-grep missing perl-regexp . grep includes perl-regexp
+makedepends="wine-tools wine-devel libxcb-devel libxcb grep $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
depends="wine $(vopt_if with_32bit "wine-32bit")"
short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
maintainer="Anthony Thompson <athompson@posteo.net>"
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (7 preceding siblings ...)
2022-10-01 21:34 ` [PR PATCH] [Updated] " ajtcode71
@ 2022-10-01 21:34 ` ajtcode71
2022-10-02 0:05 ` ajtcode71
` (25 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-01 21:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 2042 bytes --]
From 3e4deca341ee6d5a1ea5ab2bb287a53bb7b15764 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Mon, 26 Sep 2022 18:05:45 +1000
Subject: [PATCH] New package: yabridge-4.0.2
---
srcpkgs/yabridge/template | 40 +++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..a49c8eff226c
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,40 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+## chroot-grep missing perl-regexp . grep includes perl-regexp
+makedepends="wine-tools wine-devel libxcb-devel libxcb grep $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+depends="wine $(vopt_if with_32bit "wine-32bit")"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options="with_32bit"
+build_options_default="with_32bit"
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (8 preceding siblings ...)
2022-10-01 21:34 ` ajtcode71
@ 2022-10-02 0:05 ` ajtcode71
2022-10-02 0:05 ` ajtcode71
` (24 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-02 0:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 4808 bytes --]
From 3e4deca341ee6d5a1ea5ab2bb287a53bb7b15764 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Mon, 26 Sep 2022 18:05:45 +1000
Subject: [PATCH 1/2] New package: yabridge-4.0.2
---
srcpkgs/yabridge/template | 40 +++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..a49c8eff226c
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,40 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+## chroot-grep missing perl-regexp . grep includes perl-regexp
+makedepends="wine-tools wine-devel libxcb-devel libxcb grep $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+depends="wine $(vopt_if with_32bit "wine-32bit")"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options="with_32bit"
+build_options_default="with_32bit"
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
From 795b9506c3d0ef4be3c6bb6aeea44bdbedd39785 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sun, 2 Oct 2022 11:03:45 +1100
Subject: [PATCH 2/2] move grep to hostdepend
---
srcpkgs/steam-fonts/template | 3 ++-
srcpkgs/stfl/template | 2 +-
srcpkgs/yabridge/template | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/steam-fonts/template b/srcpkgs/steam-fonts/template
index 3b9de3c61c8b..a61a3c7abea2 100644
--- a/srcpkgs/steam-fonts/template
+++ b/srcpkgs/steam-fonts/template
@@ -3,13 +3,14 @@ pkgname=steam-fonts
version=1.0.0
revision=4
create_wrksrc=yes
+hostmakedepends="gzip unzip"
depends="font-util"
short_desc="Fonts to fix scrambled or missing text in steam menus"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="custom:proprietary"
homepage="https://support.steampowered.com/kb_article.php?ref=1974-YFKL-4947"
distfiles="https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts.zip"
-checksum=a03bcc9581f2896cac39967633fc43546af5ed9d73d505a10cae4016797dfeb1
+checksum=ccaf62fa39b7dd3c2cc4382b1b312019cdf94d1d8786c5beefabb0bbab6474e0
font_dirs="/usr/share/fonts/steam-fonts"
restricted=yes
diff --git a/srcpkgs/stfl/template b/srcpkgs/stfl/template
index 0d970c9d2c26..fc9dfec614c2 100644
--- a/srcpkgs/stfl/template
+++ b/srcpkgs/stfl/template
@@ -10,7 +10,7 @@ maintainer="Logen K <logen@sudotask.com>"
license="GPL-3.0-or-later"
homepage="http://www.clifford.at/stfl/"
distfiles="http://www.clifford.at/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d4a7aa181a475aaf8a8914a8ccb2a7ff28919d4c8c0f8a061e17a0c36869c090
+checksum=9c0dd5f88256609e8af8c44e0195cc53e09f6777457ec81b53fcddf4a18fef10
post_install() {
ln -sf libstfl.so.${version} ${DESTDIR}/usr/lib/libstfl.so.0
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
index a49c8eff226c..2c2ea97db2b9 100644
--- a/srcpkgs/yabridge/template
+++ b/srcpkgs/yabridge/template
@@ -4,9 +4,9 @@ version=4.0.2
revision=1
archs="x86_64"
build_style=meson
-hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+hostmakedepends="ninja pkg-config cmake git grep $(vopt_if with_32bit "gcc-multilib")"
## chroot-grep missing perl-regexp . grep includes perl-regexp
-makedepends="wine-tools wine-devel libxcb-devel libxcb grep $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
depends="wine $(vopt_if with_32bit "wine-32bit")"
short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
maintainer="Anthony Thompson <athompson@posteo.net>"
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (9 preceding siblings ...)
2022-10-02 0:05 ` ajtcode71
@ 2022-10-02 0:05 ` ajtcode71
2022-10-02 0:06 ` [PR REVIEW] " ajtcode71
` (23 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-02 0:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 3569 bytes --]
From 18545a16c26c0fa059c411c1298832ccd39baf17 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Mon, 26 Sep 2022 18:05:45 +1000
Subject: [PATCH] New package: yabridge-4.0.2
---
srcpkgs/steam-fonts/template | 3 ++-
srcpkgs/stfl/template | 2 +-
srcpkgs/yabridge/template | 40 ++++++++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/steam-fonts/template b/srcpkgs/steam-fonts/template
index 3b9de3c61c8b..a61a3c7abea2 100644
--- a/srcpkgs/steam-fonts/template
+++ b/srcpkgs/steam-fonts/template
@@ -3,13 +3,14 @@ pkgname=steam-fonts
version=1.0.0
revision=4
create_wrksrc=yes
+hostmakedepends="gzip unzip"
depends="font-util"
short_desc="Fonts to fix scrambled or missing text in steam menus"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="custom:proprietary"
homepage="https://support.steampowered.com/kb_article.php?ref=1974-YFKL-4947"
distfiles="https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts.zip"
-checksum=a03bcc9581f2896cac39967633fc43546af5ed9d73d505a10cae4016797dfeb1
+checksum=ccaf62fa39b7dd3c2cc4382b1b312019cdf94d1d8786c5beefabb0bbab6474e0
font_dirs="/usr/share/fonts/steam-fonts"
restricted=yes
diff --git a/srcpkgs/stfl/template b/srcpkgs/stfl/template
index 0d970c9d2c26..fc9dfec614c2 100644
--- a/srcpkgs/stfl/template
+++ b/srcpkgs/stfl/template
@@ -10,7 +10,7 @@ maintainer="Logen K <logen@sudotask.com>"
license="GPL-3.0-or-later"
homepage="http://www.clifford.at/stfl/"
distfiles="http://www.clifford.at/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d4a7aa181a475aaf8a8914a8ccb2a7ff28919d4c8c0f8a061e17a0c36869c090
+checksum=9c0dd5f88256609e8af8c44e0195cc53e09f6777457ec81b53fcddf4a18fef10
post_install() {
ln -sf libstfl.so.${version} ${DESTDIR}/usr/lib/libstfl.so.0
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..2c2ea97db2b9
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,40 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+hostmakedepends="ninja pkg-config cmake git grep $(vopt_if with_32bit "gcc-multilib")"
+## chroot-grep missing perl-regexp . grep includes perl-regexp
+makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+depends="wine $(vopt_if with_32bit "wine-32bit")"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options="with_32bit"
+build_options_default="with_32bit"
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (10 preceding siblings ...)
2022-10-02 0:05 ` ajtcode71
@ 2022-10-02 0:06 ` ajtcode71
2022-10-02 0:25 ` paper42
` (22 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-02 0:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 188 bytes --]
New review comment by ajtcode71 on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#discussion_r985158946
Comment:
ok.. changed it back to host depends.
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (11 preceding siblings ...)
2022-10-02 0:06 ` [PR REVIEW] " ajtcode71
@ 2022-10-02 0:25 ` paper42
2022-10-02 0:42 ` [PR PATCH] [Updated] " ajtcode71
` (21 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: paper42 @ 2022-10-02 0:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#discussion_r985160153
Comment:
it can not be there either
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (12 preceding siblings ...)
2022-10-02 0:25 ` paper42
@ 2022-10-02 0:42 ` ajtcode71
2022-10-02 0:45 ` ajtcode71
` (20 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-02 0:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 4579 bytes --]
From 18545a16c26c0fa059c411c1298832ccd39baf17 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Mon, 26 Sep 2022 18:05:45 +1000
Subject: [PATCH 1/2] New package: yabridge-4.0.2
---
srcpkgs/steam-fonts/template | 3 ++-
srcpkgs/stfl/template | 2 +-
srcpkgs/yabridge/template | 40 ++++++++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/steam-fonts/template b/srcpkgs/steam-fonts/template
index 3b9de3c61c8b..a61a3c7abea2 100644
--- a/srcpkgs/steam-fonts/template
+++ b/srcpkgs/steam-fonts/template
@@ -3,13 +3,14 @@ pkgname=steam-fonts
version=1.0.0
revision=4
create_wrksrc=yes
+hostmakedepends="gzip unzip"
depends="font-util"
short_desc="Fonts to fix scrambled or missing text in steam menus"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="custom:proprietary"
homepage="https://support.steampowered.com/kb_article.php?ref=1974-YFKL-4947"
distfiles="https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts.zip"
-checksum=a03bcc9581f2896cac39967633fc43546af5ed9d73d505a10cae4016797dfeb1
+checksum=ccaf62fa39b7dd3c2cc4382b1b312019cdf94d1d8786c5beefabb0bbab6474e0
font_dirs="/usr/share/fonts/steam-fonts"
restricted=yes
diff --git a/srcpkgs/stfl/template b/srcpkgs/stfl/template
index 0d970c9d2c26..fc9dfec614c2 100644
--- a/srcpkgs/stfl/template
+++ b/srcpkgs/stfl/template
@@ -10,7 +10,7 @@ maintainer="Logen K <logen@sudotask.com>"
license="GPL-3.0-or-later"
homepage="http://www.clifford.at/stfl/"
distfiles="http://www.clifford.at/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d4a7aa181a475aaf8a8914a8ccb2a7ff28919d4c8c0f8a061e17a0c36869c090
+checksum=9c0dd5f88256609e8af8c44e0195cc53e09f6777457ec81b53fcddf4a18fef10
post_install() {
ln -sf libstfl.so.${version} ${DESTDIR}/usr/lib/libstfl.so.0
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..2c2ea97db2b9
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,40 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+hostmakedepends="ninja pkg-config cmake git grep $(vopt_if with_32bit "gcc-multilib")"
+## chroot-grep missing perl-regexp . grep includes perl-regexp
+makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+depends="wine $(vopt_if with_32bit "wine-32bit")"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options="with_32bit"
+build_options_default="with_32bit"
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
From dbac9b19a4e6cefdd07e28ac2bd5148176e8ddc2 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sun, 2 Oct 2022 11:42:02 +1100
Subject: [PATCH 2/2] fix commit
---
srcpkgs/yabridge/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
index 2c2ea97db2b9..08d8ad9bb1f6 100644
--- a/srcpkgs/yabridge/template
+++ b/srcpkgs/yabridge/template
@@ -5,7 +5,7 @@ revision=1
archs="x86_64"
build_style=meson
hostmakedepends="ninja pkg-config cmake git grep $(vopt_if with_32bit "gcc-multilib")"
-## chroot-grep missing perl-regexp . grep includes perl-regexp
+## chroot-grep missing perl-regexp . grep (v3.8) includes perl-regexp
makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
depends="wine $(vopt_if with_32bit "wine-32bit")"
short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (13 preceding siblings ...)
2022-10-02 0:42 ` [PR PATCH] [Updated] " ajtcode71
@ 2022-10-02 0:45 ` ajtcode71
2022-10-02 0:48 ` [PR REVIEW] " ajtcode71
` (19 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-02 0:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 2048 bytes --]
From ed0b767260b7aa07c0ca60a39dbd5829228aa24f Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sun, 2 Oct 2022 11:42:02 +1100
Subject: [PATCH] New package: yabridge-4.0.2
---
srcpkgs/yabridge/template | 40 +++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..08d8ad9bb1f6
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,40 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+hostmakedepends="ninja pkg-config cmake git grep $(vopt_if with_32bit "gcc-multilib")"
+## chroot-grep missing perl-regexp . grep (v3.8) includes perl-regexp
+makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+depends="wine $(vopt_if with_32bit "wine-32bit")"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options="with_32bit"
+build_options_default="with_32bit"
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (14 preceding siblings ...)
2022-10-02 0:45 ` ajtcode71
@ 2022-10-02 0:48 ` ajtcode71
2022-10-02 9:45 ` paper42
` (18 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-02 0:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
New review comment by ajtcode71 on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#discussion_r985161751
Comment:
so if it cant be in hostmakedepends or makedepends ?????
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (15 preceding siblings ...)
2022-10-02 0:48 ` [PR REVIEW] " ajtcode71
@ 2022-10-02 9:45 ` paper42
2022-10-02 13:56 ` robbert-vdh
` (17 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: paper42 @ 2022-10-02 9:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 264 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#discussion_r985211042
Comment:
It can not be in build dependencies because it would break the masterdir. This wasn't an issue in any package so far.
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (16 preceding siblings ...)
2022-10-02 9:45 ` paper42
@ 2022-10-02 13:56 ` robbert-vdh
2022-10-03 2:08 ` [PR PATCH] [Updated] " ajtcode71
` (16 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: robbert-vdh @ 2022-10-02 13:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 502 bytes --]
New review comment by robbert-vdh on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#discussion_r985243712
Comment:
You can use a patch to change the `-P` in https://github.com/robbert-vdh/yabridge/blob/5b29ac386e346666b1407c31639c53ec99bf63e6/meson.build#L154 into `-E` since `-P` is strictly speaking not needed anymore (it's an artifact from a pervious version that required lookaround). I've never encountered a `grep` on Linux without PCRE support before though.
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (17 preceding siblings ...)
2022-10-02 13:56 ` robbert-vdh
@ 2022-10-03 2:08 ` ajtcode71
2022-10-03 2:08 ` ajtcode71
` (15 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-03 2:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 3988 bytes --]
From ed0b767260b7aa07c0ca60a39dbd5829228aa24f Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sun, 2 Oct 2022 11:42:02 +1100
Subject: [PATCH 1/2] New package: yabridge-4.0.2
---
srcpkgs/yabridge/template | 40 +++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 0000000000000..08d8ad9bb1f6e
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,40 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+hostmakedepends="ninja pkg-config cmake git grep $(vopt_if with_32bit "gcc-multilib")"
+## chroot-grep missing perl-regexp . grep (v3.8) includes perl-regexp
+makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+depends="wine $(vopt_if with_32bit "wine-32bit")"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options="with_32bit"
+build_options_default="with_32bit"
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
From dceb249d95043a9513187aa1c85ddf76938e402e Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Mon, 3 Oct 2022 13:08:10 +1100
Subject: [PATCH 2/2] New package: yabridge-4.0.2
---
srcpkgs/yabridge/patches/wine-version-check.diff | 11 +++++++++++
srcpkgs/yabridge/template | 3 +--
2 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/yabridge/patches/wine-version-check.diff
diff --git a/srcpkgs/yabridge/patches/wine-version-check.diff b/srcpkgs/yabridge/patches/wine-version-check.diff
new file mode 100644
index 0000000000000..cb061fb213a59
--- /dev/null
+++ b/srcpkgs/yabridge/patches/wine-version-check.diff
@@ -0,0 +1,11 @@
+--- a/meson.build 2022-06-27 23:54:16.000000000 +1000
++++ b/meson.build 2022-10-03 11:53:08.442051982 +1100
+@@ -135,7 +135,7 @@
+ #
+ # https://bugs.winehq.org/show_bug.cgi?id=49138
+ wine_version = run_command(
+- 'sh', '-c', '''wine --version | grep --only-matching -P '[0-9]+\.[0-9]+' | head -n1''',
++ 'sh', '-c', '''wine --version | wine --version | sed 's/[a-zA-Z-]//g' | head -n1''',
+ check : false
+ )
+ if wine_version.returncode() == 0
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
index 08d8ad9bb1f6e..1fd9e60bb6096 100644
--- a/srcpkgs/yabridge/template
+++ b/srcpkgs/yabridge/template
@@ -4,8 +4,7 @@ version=4.0.2
revision=1
archs="x86_64"
build_style=meson
-hostmakedepends="ninja pkg-config cmake git grep $(vopt_if with_32bit "gcc-multilib")"
-## chroot-grep missing perl-regexp . grep (v3.8) includes perl-regexp
+hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
depends="wine $(vopt_if with_32bit "wine-32bit")"
short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (18 preceding siblings ...)
2022-10-03 2:08 ` [PR PATCH] [Updated] " ajtcode71
@ 2022-10-03 2:08 ` ajtcode71
2022-10-03 2:14 ` [PR REVIEW] " ajtcode71
` (14 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-03 2:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 2809 bytes --]
From d9f54ceaf0c9afd275c19c29ef37478c5cd9af58 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sun, 2 Oct 2022 11:42:02 +1100
Subject: [PATCH] New package: yabridge-4.0.2
---
.../yabridge/patches/wine-version-check.diff | 11 ++++++
srcpkgs/yabridge/template | 39 +++++++++++++++++++
2 files changed, 50 insertions(+)
create mode 100644 srcpkgs/yabridge/patches/wine-version-check.diff
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/yabridge/patches/wine-version-check.diff b/srcpkgs/yabridge/patches/wine-version-check.diff
new file mode 100644
index 000000000000..cb061fb213a5
--- /dev/null
+++ b/srcpkgs/yabridge/patches/wine-version-check.diff
@@ -0,0 +1,11 @@
+--- a/meson.build 2022-06-27 23:54:16.000000000 +1000
++++ b/meson.build 2022-10-03 11:53:08.442051982 +1100
+@@ -135,7 +135,7 @@
+ #
+ # https://bugs.winehq.org/show_bug.cgi?id=49138
+ wine_version = run_command(
+- 'sh', '-c', '''wine --version | grep --only-matching -P '[0-9]+\.[0-9]+' | head -n1''',
++ 'sh', '-c', '''wine --version | wine --version | sed 's/[a-zA-Z-]//g' | head -n1''',
+ check : false
+ )
+ if wine_version.returncode() == 0
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..1fd9e60bb609
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,39 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+depends="wine $(vopt_if with_32bit "wine-32bit")"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options="with_32bit"
+build_options_default="with_32bit"
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (19 preceding siblings ...)
2022-10-03 2:08 ` ajtcode71
@ 2022-10-03 2:14 ` ajtcode71
2022-10-03 2:20 ` [PR PATCH] [Updated] " ajtcode71
` (13 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-03 2:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New review comment by ajtcode71 on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#discussion_r985339298
Comment:
Ive done a patch using sed. I can change it to grep -E is more keeping with your origin code?
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (20 preceding siblings ...)
2022-10-03 2:14 ` [PR REVIEW] " ajtcode71
@ 2022-10-03 2:20 ` ajtcode71
2022-10-03 2:20 ` ajtcode71
` (12 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-03 2:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 3825 bytes --]
From d9f54ceaf0c9afd275c19c29ef37478c5cd9af58 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sun, 2 Oct 2022 11:42:02 +1100
Subject: [PATCH 1/2] New package: yabridge-4.0.2
---
.../yabridge/patches/wine-version-check.diff | 11 ++++++
srcpkgs/yabridge/template | 39 +++++++++++++++++++
2 files changed, 50 insertions(+)
create mode 100644 srcpkgs/yabridge/patches/wine-version-check.diff
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/yabridge/patches/wine-version-check.diff b/srcpkgs/yabridge/patches/wine-version-check.diff
new file mode 100644
index 000000000000..cb061fb213a5
--- /dev/null
+++ b/srcpkgs/yabridge/patches/wine-version-check.diff
@@ -0,0 +1,11 @@
+--- a/meson.build 2022-06-27 23:54:16.000000000 +1000
++++ b/meson.build 2022-10-03 11:53:08.442051982 +1100
+@@ -135,7 +135,7 @@
+ #
+ # https://bugs.winehq.org/show_bug.cgi?id=49138
+ wine_version = run_command(
+- 'sh', '-c', '''wine --version | grep --only-matching -P '[0-9]+\.[0-9]+' | head -n1''',
++ 'sh', '-c', '''wine --version | wine --version | sed 's/[a-zA-Z-]//g' | head -n1''',
+ check : false
+ )
+ if wine_version.returncode() == 0
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..1fd9e60bb609
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,39 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+depends="wine $(vopt_if with_32bit "wine-32bit")"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options="with_32bit"
+build_options_default="with_32bit"
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
From d6bcdd31e3bbcb49237fa9e3c1494547e5438157 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Mon, 3 Oct 2022 13:20:03 +1100
Subject: [PATCH 2/2] fixed patch file
---
srcpkgs/yabridge/patches/wine-version-check.diff | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yabridge/patches/wine-version-check.diff b/srcpkgs/yabridge/patches/wine-version-check.diff
index cb061fb213a5..a51df0b33032 100644
--- a/srcpkgs/yabridge/patches/wine-version-check.diff
+++ b/srcpkgs/yabridge/patches/wine-version-check.diff
@@ -5,7 +5,7 @@
# https://bugs.winehq.org/show_bug.cgi?id=49138
wine_version = run_command(
- 'sh', '-c', '''wine --version | grep --only-matching -P '[0-9]+\.[0-9]+' | head -n1''',
-+ 'sh', '-c', '''wine --version | wine --version | sed 's/[a-zA-Z-]//g' | head -n1''',
++ 'sh', '-c', '''wine --version | wine --version | grep --only-matching -E '[0-9]+\.[0-9]+' | head -n1''',
check : false
)
if wine_version.returncode() == 0
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (21 preceding siblings ...)
2022-10-03 2:20 ` [PR PATCH] [Updated] " ajtcode71
@ 2022-10-03 2:20 ` ajtcode71
2022-10-03 2:20 ` [PR REVIEW] " ajtcode71
` (11 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-03 2:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 2829 bytes --]
From b425c0b380e8384e693d3b06b63cd4943c5e1813 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sun, 2 Oct 2022 11:42:02 +1100
Subject: [PATCH] New package: yabridge-4.0.2
---
.../yabridge/patches/wine-version-check.diff | 11 ++++++
srcpkgs/yabridge/template | 39 +++++++++++++++++++
2 files changed, 50 insertions(+)
create mode 100644 srcpkgs/yabridge/patches/wine-version-check.diff
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/yabridge/patches/wine-version-check.diff b/srcpkgs/yabridge/patches/wine-version-check.diff
new file mode 100644
index 000000000000..a51df0b33032
--- /dev/null
+++ b/srcpkgs/yabridge/patches/wine-version-check.diff
@@ -0,0 +1,11 @@
+--- a/meson.build 2022-06-27 23:54:16.000000000 +1000
++++ b/meson.build 2022-10-03 11:53:08.442051982 +1100
+@@ -135,7 +135,7 @@
+ #
+ # https://bugs.winehq.org/show_bug.cgi?id=49138
+ wine_version = run_command(
+- 'sh', '-c', '''wine --version | grep --only-matching -P '[0-9]+\.[0-9]+' | head -n1''',
++ 'sh', '-c', '''wine --version | wine --version | grep --only-matching -E '[0-9]+\.[0-9]+' | head -n1''',
+ check : false
+ )
+ if wine_version.returncode() == 0
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..1fd9e60bb609
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,39 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+depends="wine $(vopt_if with_32bit "wine-32bit")"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options="with_32bit"
+build_options_default="with_32bit"
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR REVIEW] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (22 preceding siblings ...)
2022-10-03 2:20 ` ajtcode71
@ 2022-10-03 2:20 ` ajtcode71
2022-10-03 2:22 ` [PR PATCH] [Updated] " ajtcode71
` (10 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-03 2:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New review comment by ajtcode71 on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#discussion_r985339298
Comment:
Thanks Robert!.
I had patched it to use sed. Ive just changed back to use grep -E.
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (23 preceding siblings ...)
2022-10-03 2:20 ` [PR REVIEW] " ajtcode71
@ 2022-10-03 2:22 ` ajtcode71
2022-10-03 2:22 ` ajtcode71
` (9 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-03 2:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 3847 bytes --]
From b425c0b380e8384e693d3b06b63cd4943c5e1813 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sun, 2 Oct 2022 11:42:02 +1100
Subject: [PATCH 1/2] New package: yabridge-4.0.2
---
.../yabridge/patches/wine-version-check.diff | 11 ++++++
srcpkgs/yabridge/template | 39 +++++++++++++++++++
2 files changed, 50 insertions(+)
create mode 100644 srcpkgs/yabridge/patches/wine-version-check.diff
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/yabridge/patches/wine-version-check.diff b/srcpkgs/yabridge/patches/wine-version-check.diff
new file mode 100644
index 000000000000..a51df0b33032
--- /dev/null
+++ b/srcpkgs/yabridge/patches/wine-version-check.diff
@@ -0,0 +1,11 @@
+--- a/meson.build 2022-06-27 23:54:16.000000000 +1000
++++ b/meson.build 2022-10-03 11:53:08.442051982 +1100
+@@ -135,7 +135,7 @@
+ #
+ # https://bugs.winehq.org/show_bug.cgi?id=49138
+ wine_version = run_command(
+- 'sh', '-c', '''wine --version | grep --only-matching -P '[0-9]+\.[0-9]+' | head -n1''',
++ 'sh', '-c', '''wine --version | wine --version | grep --only-matching -E '[0-9]+\.[0-9]+' | head -n1''',
+ check : false
+ )
+ if wine_version.returncode() == 0
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..1fd9e60bb609
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,39 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+depends="wine $(vopt_if with_32bit "wine-32bit")"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options="with_32bit"
+build_options_default="with_32bit"
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
From d6b0a4d290ee735cbbb7605aa87e09c80ce67677 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Mon, 3 Oct 2022 13:21:53 +1100
Subject: [PATCH 2/2] fixed patch file
---
srcpkgs/yabridge/patches/wine-version-check.diff | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yabridge/patches/wine-version-check.diff b/srcpkgs/yabridge/patches/wine-version-check.diff
index a51df0b33032..86fae294d6c2 100644
--- a/srcpkgs/yabridge/patches/wine-version-check.diff
+++ b/srcpkgs/yabridge/patches/wine-version-check.diff
@@ -5,7 +5,7 @@
# https://bugs.winehq.org/show_bug.cgi?id=49138
wine_version = run_command(
- 'sh', '-c', '''wine --version | grep --only-matching -P '[0-9]+\.[0-9]+' | head -n1''',
-+ 'sh', '-c', '''wine --version | wine --version | grep --only-matching -E '[0-9]+\.[0-9]+' | head -n1''',
++ 'sh', '-c', '''wine --version | grep --only-matching -E '[0-9]+\.[0-9]+' | head -n1''',
check : false
)
if wine_version.returncode() == 0
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (24 preceding siblings ...)
2022-10-03 2:22 ` [PR PATCH] [Updated] " ajtcode71
@ 2022-10-03 2:22 ` ajtcode71
2022-10-10 2:07 ` ajtcode71
` (8 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-03 2:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 2811 bytes --]
From 89a0a90506c7de8f89b3cdb376fbe838dad5a67d Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sun, 2 Oct 2022 11:42:02 +1100
Subject: [PATCH] New package: yabridge-4.0.2
---
.../yabridge/patches/wine-version-check.diff | 11 ++++++
srcpkgs/yabridge/template | 39 +++++++++++++++++++
2 files changed, 50 insertions(+)
create mode 100644 srcpkgs/yabridge/patches/wine-version-check.diff
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/yabridge/patches/wine-version-check.diff b/srcpkgs/yabridge/patches/wine-version-check.diff
new file mode 100644
index 000000000000..86fae294d6c2
--- /dev/null
+++ b/srcpkgs/yabridge/patches/wine-version-check.diff
@@ -0,0 +1,11 @@
+--- a/meson.build 2022-06-27 23:54:16.000000000 +1000
++++ b/meson.build 2022-10-03 11:53:08.442051982 +1100
+@@ -135,7 +135,7 @@
+ #
+ # https://bugs.winehq.org/show_bug.cgi?id=49138
+ wine_version = run_command(
+- 'sh', '-c', '''wine --version | grep --only-matching -P '[0-9]+\.[0-9]+' | head -n1''',
++ 'sh', '-c', '''wine --version | grep --only-matching -E '[0-9]+\.[0-9]+' | head -n1''',
+ check : false
+ )
+ if wine_version.returncode() == 0
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..1fd9e60bb609
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,39 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+depends="wine $(vopt_if with_32bit "wine-32bit")"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options="with_32bit"
+build_options_default="with_32bit"
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (25 preceding siblings ...)
2022-10-03 2:22 ` ajtcode71
@ 2022-10-10 2:07 ` ajtcode71
2022-10-27 8:48 ` [PR PATCH] [Updated] " ajtcode71
` (7 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-10 2:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New comment by ajtcode71 on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#issuecomment-1272707814
Comment:
Ive removed the grep dependency. Is there anything else that needs to be done to get this package merged?
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (26 preceding siblings ...)
2022-10-10 2:07 ` ajtcode71
@ 2022-10-27 8:48 ` ajtcode71
2022-10-27 21:14 ` ajtcode71
` (6 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-27 8:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 16251 bytes --]
From 89a0a90506c7de8f89b3cdb376fbe838dad5a67d Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sun, 2 Oct 2022 11:42:02 +1100
Subject: [PATCH 1/6] New package: yabridge-4.0.2
---
.../yabridge/patches/wine-version-check.diff | 11 ++++++
srcpkgs/yabridge/template | 39 +++++++++++++++++++
2 files changed, 50 insertions(+)
create mode 100644 srcpkgs/yabridge/patches/wine-version-check.diff
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/yabridge/patches/wine-version-check.diff b/srcpkgs/yabridge/patches/wine-version-check.diff
new file mode 100644
index 000000000000..86fae294d6c2
--- /dev/null
+++ b/srcpkgs/yabridge/patches/wine-version-check.diff
@@ -0,0 +1,11 @@
+--- a/meson.build 2022-06-27 23:54:16.000000000 +1000
++++ b/meson.build 2022-10-03 11:53:08.442051982 +1100
+@@ -135,7 +135,7 @@
+ #
+ # https://bugs.winehq.org/show_bug.cgi?id=49138
+ wine_version = run_command(
+- 'sh', '-c', '''wine --version | grep --only-matching -P '[0-9]+\.[0-9]+' | head -n1''',
++ 'sh', '-c', '''wine --version | grep --only-matching -E '[0-9]+\.[0-9]+' | head -n1''',
+ check : false
+ )
+ if wine_version.returncode() == 0
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..1fd9e60bb609
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,39 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+depends="wine $(vopt_if with_32bit "wine-32bit")"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options="with_32bit"
+build_options_default="with_32bit"
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
From cfc120e34a1006515f6e9270fb60e4406c287671 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Mon, 24 Oct 2022 11:14:19 +1100
Subject: [PATCH 2/6] testing musl patches
---
srcpkgs/yabridge/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
index 1fd9e60bb609..0a3143e13fdb 100644
--- a/srcpkgs/yabridge/template
+++ b/srcpkgs/yabridge/template
@@ -2,7 +2,7 @@
pkgname=yabridge
version=4.0.2
revision=1
-archs="x86_64"
+#archs=""
build_style=meson
hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
@@ -14,7 +14,7 @@ homepage="https://github.com/robbert-vdh/yabridge"
distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
build_options="with_32bit"
-build_options_default="with_32bit"
+build_options_default="~wiith_32bit"
do_configure() {
cd ${wrksrc}
From 9de12967f46c396c87e37d8c353646ecf2266213 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Thu, 27 Oct 2022 08:22:07 +1100
Subject: [PATCH 3/6] fixed yabridge-host copying
---
.../patches/01-rtlimit_rttime-musl-fix.patch | 39 +++++++++++++++++++
srcpkgs/yabridge/template | 39 ++++++++++++++-----
2 files changed, 69 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/yabridge/patches/01-rtlimit_rttime-musl-fix.patch
diff --git a/srcpkgs/yabridge/patches/01-rtlimit_rttime-musl-fix.patch b/srcpkgs/yabridge/patches/01-rtlimit_rttime-musl-fix.patch
new file mode 100644
index 000000000000..f8916369060b
--- /dev/null
+++ b/srcpkgs/yabridge/patches/01-rtlimit_rttime-musl-fix.patch
@@ -0,0 +1,39 @@
+From 616df46cb6f4e73efa9db524957765f28a6b713d Mon Sep 17 00:00:00 2001
+From: Anthony Thompson <athompson@posteo.net>
+Date: Mon, 24 Oct 2022 11:37:59 +1100
+Subject: [PATCH] fix RTLIMIT_RTTIME not in scope for musl
+
+---
+ src/common/utils.cpp | 2 +-
+ src/wine-host/utils.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/common/utils.cpp b/src/common/utils.cpp
+index c98e0d27..0de4c793 100644
+--- a/src/common/utils.cpp
++++ b/src/common/utils.cpp
+@@ -17,7 +17,7 @@
+ #include "utils.h"
+
+ #include <stdlib.h>
+-
++#include <asm-generic/resource.h>
+ #include <sched.h>
+ #include <xmmintrin.h>
+
+diff --git a/src/wine-host/utils.cpp b/src/wine-host/utils.cpp
+index f1038174..d415ccde 100644
+--- a/src/wine-host/utils.cpp
++++ b/src/wine-host/utils.cpp
+@@ -17,7 +17,7 @@
+ #include "utils.h"
+
+ #include <iostream>
+-
++#include <asm-generic/resource.h>
+ #include "bridges/common.h"
+
+ using namespace std::literals::chrono_literals;
+--
+2.38.1
+
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
index 0a3143e13fdb..21f5e50a15d3 100644
--- a/srcpkgs/yabridge/template
+++ b/srcpkgs/yabridge/template
@@ -4,9 +4,16 @@ version=4.0.2
revision=1
#archs=""
build_style=meson
-hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
-makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
-depends="wine $(vopt_if with_32bit "wine-32bit")"
+
+if [ $XBPS_MACHINE = "i686" ]; then
+ hostmakedepends="ninja pkg-config cmake git"
+ makedepends="wine-tools wine-devel libxcb-devel libxcb"
+ depends="wine"
+ else
+ hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+ makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+ depends="wine $(vopt_if with_32bit "wine-32bit")"
+fi
short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
maintainer="Anthony Thompson <athompson@posteo.net>"
license="GPL-3.0-or-later"
@@ -14,11 +21,16 @@ homepage="https://github.com/robbert-vdh/yabridge"
distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
build_options="with_32bit"
-build_options_default="~wiith_32bit"
+build_options_default="wiith_32bit"
+
do_configure() {
cd ${wrksrc}
- meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+ if [ $XBPS_MACHINE = "i686" ]; then
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 -Dbitbridge=true -Dbuild.cpp_args='-m32' -Dbuild.cpp_link_args='-m32'
+ else
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+ fi
}
do_build() {
@@ -27,10 +39,19 @@ do_build() {
do_install() {
cd ${wrksrc}/build
- vbin yabridge-host.exe
- vbin yabridge-host.exe.so
- vopt_if with_32bit vbin yabridge-host-32.exe.so
- vopt_if with_32bit vbin yabridge-host-32.exe
+ if [ $XBPS_MACHINE = "x86_64" ]; then
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ echo -n "Copied host 64 files"
+ if [ $(vopt_if with_32bit true false) = "true" ]; then
+ vbin yabridge-host-32.exe.so
+ vbin yabridge-host-32.exe
+ echo -n "copied host 32 files"
+ fi
+ else
+ vbin yabridge-host-32.exe.so
+ vbin yabridge-host-32.exe
+ fi
vmkdir usr/lib
vcopy libyabridge-chainloader-vst2.so /usr/lib
vcopy libyabridge-vst2.so /usr/lib
From f26cb1a770335b088ad1c8bf3f50f06ad491cea4 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Thu, 27 Oct 2022 19:08:35 +1100
Subject: [PATCH 4/6] Working.. needs subpac
---
srcpkgs/yabridge/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
index 21f5e50a15d3..3fa7ee3f1c3e 100644
--- a/srcpkgs/yabridge/template
+++ b/srcpkgs/yabridge/template
@@ -5,7 +5,7 @@ revision=1
#archs=""
build_style=meson
-if [ $XBPS_MACHINE = "i686" ]; then
+if [ $XBPS_MACHINE = "i686" ] || [ $XBPS_MACHINE = "x86_64-musl" ]; then
hostmakedepends="ninja pkg-config cmake git"
makedepends="wine-tools wine-devel libxcb-devel libxcb"
depends="wine"
@@ -21,7 +21,7 @@ homepage="https://github.com/robbert-vdh/yabridge"
distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
build_options="with_32bit"
-build_options_default="wiith_32bit"
+build_options_default="with_32bit"
do_configure() {
@@ -39,18 +39,18 @@ do_build() {
do_install() {
cd ${wrksrc}/build
- if [ $XBPS_MACHINE = "x86_64" ]; then
+ if [ $XBPS_MACHINE = "x86_64-musl" ] || [ $XBPS_MACHINE = "x86_64" ]; then
vbin yabridge-host.exe
vbin yabridge-host.exe.so
- echo -n "Copied host 64 files"
- if [ $(vopt_if with_32bit true false) = "true" ]; then
+ if [ [ $(vopt_if with_32bit true false) = "true" ] && [ $XBPS_LIBC = "glibc"] ]; then
+ echo -n " GLIBC\***************888"
vbin yabridge-host-32.exe.so
vbin yabridge-host-32.exe
- echo -n "copied host 32 files"
fi
else
vbin yabridge-host-32.exe.so
vbin yabridge-host-32.exe
+ echo -n "Coping 32bit hosts"
fi
vmkdir usr/lib
vcopy libyabridge-chainloader-vst2.so /usr/lib
From cf223e763685929093acb04a39aa9bf85f549ee9 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Thu, 27 Oct 2022 19:10:56 +1100
Subject: [PATCH 5/6] more fixes
---
srcpkgs/yabridge/template | 35 ++++++++++++++++++++++++++++++-----
srcpkgs/yabridgectl | 1 +
2 files changed, 31 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/yabridgectl
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
index 3fa7ee3f1c3e..6eea56a56ee5 100644
--- a/srcpkgs/yabridge/template
+++ b/srcpkgs/yabridge/template
@@ -2,17 +2,27 @@
pkgname=yabridge
version=4.0.2
revision=1
-#archs=""
+archs="i686* x86_64*"
build_style=meson
+<<<<<<< HEAD
if [ $XBPS_MACHINE = "i686" ] || [ $XBPS_MACHINE = "x86_64-musl" ]; then
hostmakedepends="ninja pkg-config cmake git"
+=======
+if [ $XBPS_MACHINE = "i686" ]; then
+ hostmakedepends="ninja pkg-config cmake git cargo"
+>>>>>>> yabridge-sub
makedepends="wine-tools wine-devel libxcb-devel libxcb"
- depends="wine"
- else
- hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+ depends="wine yabridgectl"
+ elif [ $XBPS_LIBC = "glibc" ]; then
+ hostmakedepends="ninja cargo pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
- depends="wine $(vopt_if with_32bit "wine-32bit")"
+ depends="wine $(vopt_if with_32bit "wine-32bit") yabridgectl"
+ else
+ hostmakedepends="ninja cargo pkg-config cmake git"
+ makedepends="wine-tools wine-devel libxcb-devel libxcb"
+ depends="wine yabridgectl"
+# fi
fi
short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
maintainer="Anthony Thompson <athompson@posteo.net>"
@@ -23,6 +33,14 @@ checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
build_options="with_32bit"
build_options_default="with_32bit"
+yabridgectl_package() {
+ shortdesc+="Utility to setup and manage yabridge"
+ depends="${sourcepkg}"
+ pkg_install() {
+ cd ${wrksrc}/tools/yabridgectl/target/release
+ vbin yabridgectl
+ }
+}
do_configure() {
cd ${wrksrc}
@@ -35,6 +53,8 @@ do_configure() {
do_build() {
ninja -C build/
+ cd ${wrksrc}/tools/yabridgectl
+ cargo build --release
}
do_install() {
@@ -46,7 +66,12 @@ do_install() {
echo -n " GLIBC\***************888"
vbin yabridge-host-32.exe.so
vbin yabridge-host-32.exe
+<<<<<<< HEAD
fi
+=======
+ echo -n "copied host 32 files"
+ fi
+>>>>>>> yabridge-sub
else
vbin yabridge-host-32.exe.so
vbin yabridge-host-32.exe
diff --git a/srcpkgs/yabridgectl b/srcpkgs/yabridgectl
new file mode 120000
index 000000000000..142ce41a5d93
--- /dev/null
+++ b/srcpkgs/yabridgectl
@@ -0,0 +1 @@
+yabridge/
\ No newline at end of file
From 2aa6aaade8f2c03188cf04b4d92e895e9c209358 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Thu, 27 Oct 2022 19:46:01 +1100
Subject: [PATCH 6/6] sub package added
---
srcpkgs/yabridge/template | 43 ++++++++++++++++-----------------------
1 file changed, 17 insertions(+), 26 deletions(-)
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
index 6eea56a56ee5..1f35910a3e93 100644
--- a/srcpkgs/yabridge/template
+++ b/srcpkgs/yabridge/template
@@ -5,25 +5,6 @@ revision=1
archs="i686* x86_64*"
build_style=meson
-<<<<<<< HEAD
-if [ $XBPS_MACHINE = "i686" ] || [ $XBPS_MACHINE = "x86_64-musl" ]; then
- hostmakedepends="ninja pkg-config cmake git"
-=======
-if [ $XBPS_MACHINE = "i686" ]; then
- hostmakedepends="ninja pkg-config cmake git cargo"
->>>>>>> yabridge-sub
- makedepends="wine-tools wine-devel libxcb-devel libxcb"
- depends="wine yabridgectl"
- elif [ $XBPS_LIBC = "glibc" ]; then
- hostmakedepends="ninja cargo pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
- makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
- depends="wine $(vopt_if with_32bit "wine-32bit") yabridgectl"
- else
- hostmakedepends="ninja cargo pkg-config cmake git"
- makedepends="wine-tools wine-devel libxcb-devel libxcb"
- depends="wine yabridgectl"
-# fi
-fi
short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
maintainer="Anthony Thompson <athompson@posteo.net>"
license="GPL-3.0-or-later"
@@ -33,6 +14,22 @@ checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
build_options="with_32bit"
build_options_default="with_32bit"
+if [ $XBPS_MACHINE = "i686" ] || [ $XBPS_MACHINE = "x86_64-musl" ]; then
+ hostmakedepends="ninja pkg-config cmake git cargo"
+ makedepends="wine-tools wine-devel libxcb-devel libxcb"
+ depends="wine yabridgectl"
+
+ elif [ $XBPS_LIBC = "glibc" ]; then
+ hostmakedepends="ninja cargo pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+ makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+ depends="wine $(vopt_if with_32bit "wine-32bit") yabridgectl"
+# else
+# hostmakedepends="ninja cargo pkg-config cmake git"
+# makedepends="wine-tools wine-devel libxcb-devel libxcb"
+# depends="wine yabridgectl"
+
+fi
+
yabridgectl_package() {
shortdesc+="Utility to setup and manage yabridge"
depends="${sourcepkg}"
@@ -63,15 +60,9 @@ do_install() {
vbin yabridge-host.exe
vbin yabridge-host.exe.so
if [ [ $(vopt_if with_32bit true false) = "true" ] && [ $XBPS_LIBC = "glibc"] ]; then
- echo -n " GLIBC\***************888"
vbin yabridge-host-32.exe.so
- vbin yabridge-host-32.exe
-<<<<<<< HEAD
- fi
-=======
- echo -n "copied host 32 files"
+ vbin yabridge-host-32.exe
fi
->>>>>>> yabridge-sub
else
vbin yabridge-host-32.exe.so
vbin yabridge-host-32.exe
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (27 preceding siblings ...)
2022-10-27 8:48 ` [PR PATCH] [Updated] " ajtcode71
@ 2022-10-27 21:14 ` ajtcode71
2022-10-27 21:23 ` ajtcode71
` (5 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-27 21:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 18318 bytes --]
From 89a0a90506c7de8f89b3cdb376fbe838dad5a67d Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sun, 2 Oct 2022 11:42:02 +1100
Subject: [PATCH 1/7] New package: yabridge-4.0.2
---
.../yabridge/patches/wine-version-check.diff | 11 ++++++
srcpkgs/yabridge/template | 39 +++++++++++++++++++
2 files changed, 50 insertions(+)
create mode 100644 srcpkgs/yabridge/patches/wine-version-check.diff
create mode 100644 srcpkgs/yabridge/template
diff --git a/srcpkgs/yabridge/patches/wine-version-check.diff b/srcpkgs/yabridge/patches/wine-version-check.diff
new file mode 100644
index 000000000000..86fae294d6c2
--- /dev/null
+++ b/srcpkgs/yabridge/patches/wine-version-check.diff
@@ -0,0 +1,11 @@
+--- a/meson.build 2022-06-27 23:54:16.000000000 +1000
++++ b/meson.build 2022-10-03 11:53:08.442051982 +1100
+@@ -135,7 +135,7 @@
+ #
+ # https://bugs.winehq.org/show_bug.cgi?id=49138
+ wine_version = run_command(
+- 'sh', '-c', '''wine --version | grep --only-matching -P '[0-9]+\.[0-9]+' | head -n1''',
++ 'sh', '-c', '''wine --version | grep --only-matching -E '[0-9]+\.[0-9]+' | head -n1''',
+ check : false
+ )
+ if wine_version.returncode() == 0
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..1fd9e60bb609
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,39 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="x86_64"
+build_style=meson
+hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+depends="wine $(vopt_if with_32bit "wine-32bit")"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options="with_32bit"
+build_options_default="with_32bit"
+
+do_configure() {
+ cd ${wrksrc}
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+}
+
+do_build() {
+ ninja -C build/
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe.so
+ vopt_if with_32bit vbin yabridge-host-32.exe
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
From cfc120e34a1006515f6e9270fb60e4406c287671 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Mon, 24 Oct 2022 11:14:19 +1100
Subject: [PATCH 2/7] testing musl patches
---
srcpkgs/yabridge/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
index 1fd9e60bb609..0a3143e13fdb 100644
--- a/srcpkgs/yabridge/template
+++ b/srcpkgs/yabridge/template
@@ -2,7 +2,7 @@
pkgname=yabridge
version=4.0.2
revision=1
-archs="x86_64"
+#archs=""
build_style=meson
hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
@@ -14,7 +14,7 @@ homepage="https://github.com/robbert-vdh/yabridge"
distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
build_options="with_32bit"
-build_options_default="with_32bit"
+build_options_default="~wiith_32bit"
do_configure() {
cd ${wrksrc}
From 9de12967f46c396c87e37d8c353646ecf2266213 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Thu, 27 Oct 2022 08:22:07 +1100
Subject: [PATCH 3/7] fixed yabridge-host copying
---
.../patches/01-rtlimit_rttime-musl-fix.patch | 39 +++++++++++++++++++
srcpkgs/yabridge/template | 39 ++++++++++++++-----
2 files changed, 69 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/yabridge/patches/01-rtlimit_rttime-musl-fix.patch
diff --git a/srcpkgs/yabridge/patches/01-rtlimit_rttime-musl-fix.patch b/srcpkgs/yabridge/patches/01-rtlimit_rttime-musl-fix.patch
new file mode 100644
index 000000000000..f8916369060b
--- /dev/null
+++ b/srcpkgs/yabridge/patches/01-rtlimit_rttime-musl-fix.patch
@@ -0,0 +1,39 @@
+From 616df46cb6f4e73efa9db524957765f28a6b713d Mon Sep 17 00:00:00 2001
+From: Anthony Thompson <athompson@posteo.net>
+Date: Mon, 24 Oct 2022 11:37:59 +1100
+Subject: [PATCH] fix RTLIMIT_RTTIME not in scope for musl
+
+---
+ src/common/utils.cpp | 2 +-
+ src/wine-host/utils.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/common/utils.cpp b/src/common/utils.cpp
+index c98e0d27..0de4c793 100644
+--- a/src/common/utils.cpp
++++ b/src/common/utils.cpp
+@@ -17,7 +17,7 @@
+ #include "utils.h"
+
+ #include <stdlib.h>
+-
++#include <asm-generic/resource.h>
+ #include <sched.h>
+ #include <xmmintrin.h>
+
+diff --git a/src/wine-host/utils.cpp b/src/wine-host/utils.cpp
+index f1038174..d415ccde 100644
+--- a/src/wine-host/utils.cpp
++++ b/src/wine-host/utils.cpp
+@@ -17,7 +17,7 @@
+ #include "utils.h"
+
+ #include <iostream>
+-
++#include <asm-generic/resource.h>
+ #include "bridges/common.h"
+
+ using namespace std::literals::chrono_literals;
+--
+2.38.1
+
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
index 0a3143e13fdb..21f5e50a15d3 100644
--- a/srcpkgs/yabridge/template
+++ b/srcpkgs/yabridge/template
@@ -4,9 +4,16 @@ version=4.0.2
revision=1
#archs=""
build_style=meson
-hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
-makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
-depends="wine $(vopt_if with_32bit "wine-32bit")"
+
+if [ $XBPS_MACHINE = "i686" ]; then
+ hostmakedepends="ninja pkg-config cmake git"
+ makedepends="wine-tools wine-devel libxcb-devel libxcb"
+ depends="wine"
+ else
+ hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+ makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+ depends="wine $(vopt_if with_32bit "wine-32bit")"
+fi
short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
maintainer="Anthony Thompson <athompson@posteo.net>"
license="GPL-3.0-or-later"
@@ -14,11 +21,16 @@ homepage="https://github.com/robbert-vdh/yabridge"
distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
build_options="with_32bit"
-build_options_default="~wiith_32bit"
+build_options_default="wiith_32bit"
+
do_configure() {
cd ${wrksrc}
- meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+ if [ $XBPS_MACHINE = "i686" ]; then
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 -Dbitbridge=true -Dbuild.cpp_args='-m32' -Dbuild.cpp_link_args='-m32'
+ else
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+ fi
}
do_build() {
@@ -27,10 +39,19 @@ do_build() {
do_install() {
cd ${wrksrc}/build
- vbin yabridge-host.exe
- vbin yabridge-host.exe.so
- vopt_if with_32bit vbin yabridge-host-32.exe.so
- vopt_if with_32bit vbin yabridge-host-32.exe
+ if [ $XBPS_MACHINE = "x86_64" ]; then
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ echo -n "Copied host 64 files"
+ if [ $(vopt_if with_32bit true false) = "true" ]; then
+ vbin yabridge-host-32.exe.so
+ vbin yabridge-host-32.exe
+ echo -n "copied host 32 files"
+ fi
+ else
+ vbin yabridge-host-32.exe.so
+ vbin yabridge-host-32.exe
+ fi
vmkdir usr/lib
vcopy libyabridge-chainloader-vst2.so /usr/lib
vcopy libyabridge-vst2.so /usr/lib
From f26cb1a770335b088ad1c8bf3f50f06ad491cea4 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Thu, 27 Oct 2022 19:08:35 +1100
Subject: [PATCH 4/7] Working.. needs subpac
---
srcpkgs/yabridge/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
index 21f5e50a15d3..3fa7ee3f1c3e 100644
--- a/srcpkgs/yabridge/template
+++ b/srcpkgs/yabridge/template
@@ -5,7 +5,7 @@ revision=1
#archs=""
build_style=meson
-if [ $XBPS_MACHINE = "i686" ]; then
+if [ $XBPS_MACHINE = "i686" ] || [ $XBPS_MACHINE = "x86_64-musl" ]; then
hostmakedepends="ninja pkg-config cmake git"
makedepends="wine-tools wine-devel libxcb-devel libxcb"
depends="wine"
@@ -21,7 +21,7 @@ homepage="https://github.com/robbert-vdh/yabridge"
distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
build_options="with_32bit"
-build_options_default="wiith_32bit"
+build_options_default="with_32bit"
do_configure() {
@@ -39,18 +39,18 @@ do_build() {
do_install() {
cd ${wrksrc}/build
- if [ $XBPS_MACHINE = "x86_64" ]; then
+ if [ $XBPS_MACHINE = "x86_64-musl" ] || [ $XBPS_MACHINE = "x86_64" ]; then
vbin yabridge-host.exe
vbin yabridge-host.exe.so
- echo -n "Copied host 64 files"
- if [ $(vopt_if with_32bit true false) = "true" ]; then
+ if [ [ $(vopt_if with_32bit true false) = "true" ] && [ $XBPS_LIBC = "glibc"] ]; then
+ echo -n " GLIBC\***************888"
vbin yabridge-host-32.exe.so
vbin yabridge-host-32.exe
- echo -n "copied host 32 files"
fi
else
vbin yabridge-host-32.exe.so
vbin yabridge-host-32.exe
+ echo -n "Coping 32bit hosts"
fi
vmkdir usr/lib
vcopy libyabridge-chainloader-vst2.so /usr/lib
From cf223e763685929093acb04a39aa9bf85f549ee9 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Thu, 27 Oct 2022 19:10:56 +1100
Subject: [PATCH 5/7] more fixes
---
srcpkgs/yabridge/template | 35 ++++++++++++++++++++++++++++++-----
srcpkgs/yabridgectl | 1 +
2 files changed, 31 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/yabridgectl
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
index 3fa7ee3f1c3e..6eea56a56ee5 100644
--- a/srcpkgs/yabridge/template
+++ b/srcpkgs/yabridge/template
@@ -2,17 +2,27 @@
pkgname=yabridge
version=4.0.2
revision=1
-#archs=""
+archs="i686* x86_64*"
build_style=meson
+<<<<<<< HEAD
if [ $XBPS_MACHINE = "i686" ] || [ $XBPS_MACHINE = "x86_64-musl" ]; then
hostmakedepends="ninja pkg-config cmake git"
+=======
+if [ $XBPS_MACHINE = "i686" ]; then
+ hostmakedepends="ninja pkg-config cmake git cargo"
+>>>>>>> yabridge-sub
makedepends="wine-tools wine-devel libxcb-devel libxcb"
- depends="wine"
- else
- hostmakedepends="ninja pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+ depends="wine yabridgectl"
+ elif [ $XBPS_LIBC = "glibc" ]; then
+ hostmakedepends="ninja cargo pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
- depends="wine $(vopt_if with_32bit "wine-32bit")"
+ depends="wine $(vopt_if with_32bit "wine-32bit") yabridgectl"
+ else
+ hostmakedepends="ninja cargo pkg-config cmake git"
+ makedepends="wine-tools wine-devel libxcb-devel libxcb"
+ depends="wine yabridgectl"
+# fi
fi
short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
maintainer="Anthony Thompson <athompson@posteo.net>"
@@ -23,6 +33,14 @@ checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
build_options="with_32bit"
build_options_default="with_32bit"
+yabridgectl_package() {
+ shortdesc+="Utility to setup and manage yabridge"
+ depends="${sourcepkg}"
+ pkg_install() {
+ cd ${wrksrc}/tools/yabridgectl/target/release
+ vbin yabridgectl
+ }
+}
do_configure() {
cd ${wrksrc}
@@ -35,6 +53,8 @@ do_configure() {
do_build() {
ninja -C build/
+ cd ${wrksrc}/tools/yabridgectl
+ cargo build --release
}
do_install() {
@@ -46,7 +66,12 @@ do_install() {
echo -n " GLIBC\***************888"
vbin yabridge-host-32.exe.so
vbin yabridge-host-32.exe
+<<<<<<< HEAD
fi
+=======
+ echo -n "copied host 32 files"
+ fi
+>>>>>>> yabridge-sub
else
vbin yabridge-host-32.exe.so
vbin yabridge-host-32.exe
diff --git a/srcpkgs/yabridgectl b/srcpkgs/yabridgectl
new file mode 120000
index 000000000000..142ce41a5d93
--- /dev/null
+++ b/srcpkgs/yabridgectl
@@ -0,0 +1 @@
+yabridge/
\ No newline at end of file
From 2aa6aaade8f2c03188cf04b4d92e895e9c209358 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Thu, 27 Oct 2022 19:46:01 +1100
Subject: [PATCH 6/7] sub package added
---
srcpkgs/yabridge/template | 43 ++++++++++++++++-----------------------
1 file changed, 17 insertions(+), 26 deletions(-)
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
index 6eea56a56ee5..1f35910a3e93 100644
--- a/srcpkgs/yabridge/template
+++ b/srcpkgs/yabridge/template
@@ -5,25 +5,6 @@ revision=1
archs="i686* x86_64*"
build_style=meson
-<<<<<<< HEAD
-if [ $XBPS_MACHINE = "i686" ] || [ $XBPS_MACHINE = "x86_64-musl" ]; then
- hostmakedepends="ninja pkg-config cmake git"
-=======
-if [ $XBPS_MACHINE = "i686" ]; then
- hostmakedepends="ninja pkg-config cmake git cargo"
->>>>>>> yabridge-sub
- makedepends="wine-tools wine-devel libxcb-devel libxcb"
- depends="wine yabridgectl"
- elif [ $XBPS_LIBC = "glibc" ]; then
- hostmakedepends="ninja cargo pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
- makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
- depends="wine $(vopt_if with_32bit "wine-32bit") yabridgectl"
- else
- hostmakedepends="ninja cargo pkg-config cmake git"
- makedepends="wine-tools wine-devel libxcb-devel libxcb"
- depends="wine yabridgectl"
-# fi
-fi
short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
maintainer="Anthony Thompson <athompson@posteo.net>"
license="GPL-3.0-or-later"
@@ -33,6 +14,22 @@ checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
build_options="with_32bit"
build_options_default="with_32bit"
+if [ $XBPS_MACHINE = "i686" ] || [ $XBPS_MACHINE = "x86_64-musl" ]; then
+ hostmakedepends="ninja pkg-config cmake git cargo"
+ makedepends="wine-tools wine-devel libxcb-devel libxcb"
+ depends="wine yabridgectl"
+
+ elif [ $XBPS_LIBC = "glibc" ]; then
+ hostmakedepends="ninja cargo pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+ makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+ depends="wine $(vopt_if with_32bit "wine-32bit") yabridgectl"
+# else
+# hostmakedepends="ninja cargo pkg-config cmake git"
+# makedepends="wine-tools wine-devel libxcb-devel libxcb"
+# depends="wine yabridgectl"
+
+fi
+
yabridgectl_package() {
shortdesc+="Utility to setup and manage yabridge"
depends="${sourcepkg}"
@@ -63,15 +60,9 @@ do_install() {
vbin yabridge-host.exe
vbin yabridge-host.exe.so
if [ [ $(vopt_if with_32bit true false) = "true" ] && [ $XBPS_LIBC = "glibc"] ]; then
- echo -n " GLIBC\***************888"
vbin yabridge-host-32.exe.so
- vbin yabridge-host-32.exe
-<<<<<<< HEAD
- fi
-=======
- echo -n "copied host 32 files"
+ vbin yabridge-host-32.exe
fi
->>>>>>> yabridge-sub
else
vbin yabridge-host-32.exe.so
vbin yabridge-host-32.exe
From 70670390ab713e89ed27f601bd0f7536ea449513 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Fri, 28 Oct 2022 08:14:06 +1100
Subject: [PATCH 7/7] New package: yabridge-4.0.2
---
srcpkgs/yabridge/template | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
index 1f35910a3e93..d44bd4be5b95 100644
--- a/srcpkgs/yabridge/template
+++ b/srcpkgs/yabridge/template
@@ -5,14 +5,18 @@ revision=1
archs="i686* x86_64*"
build_style=meson
-short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux 64bit host"
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux"
maintainer="Anthony Thompson <athompson@posteo.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/robbert-vdh/yabridge"
distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
-build_options="with_32bit"
build_options_default="with_32bit"
+build_options="with_32bit"
+
+if [ $XBPS_MACHINE = "x86_64-musl" ]; then
+ build_options="~with_32bit"
+fi
if [ $XBPS_MACHINE = "i686" ] || [ $XBPS_MACHINE = "x86_64-musl" ]; then
hostmakedepends="ninja pkg-config cmake git cargo"
@@ -23,10 +27,6 @@ if [ $XBPS_MACHINE = "i686" ] || [ $XBPS_MACHINE = "x86_64-musl" ]; then
hostmakedepends="ninja cargo pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
depends="wine $(vopt_if with_32bit "wine-32bit") yabridgectl"
-# else
-# hostmakedepends="ninja cargo pkg-config cmake git"
-# makedepends="wine-tools wine-devel libxcb-devel libxcb"
-# depends="wine yabridgectl"
fi
@@ -66,7 +66,6 @@ do_install() {
else
vbin yabridge-host-32.exe.so
vbin yabridge-host-32.exe
- echo -n "Coping 32bit hosts"
fi
vmkdir usr/lib
vcopy libyabridge-chainloader-vst2.so /usr/lib
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Updated] New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (28 preceding siblings ...)
2022-10-27 21:14 ` ajtcode71
@ 2022-10-27 21:23 ` ajtcode71
2022-10-27 21:28 ` ajtcode71
` (4 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-27 21:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 750 bytes --]
There is an updated pull request by ajtcode71 against master on the void-packages repository
https://github.com/ajtcode71/void-packages yabridge
https://github.com/void-linux/void-packages/pull/39475
New package: yabridge-4.0.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/39475.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yabridge-39475.patch --]
[-- Type: text/x-diff, Size: 5606 bytes --]
From e82169a81fa5f2df42ca867cff2db47b50934515 Mon Sep 17 00:00:00 2001
From: Anthony Thompson <athompson@posteo.net>
Date: Sun, 2 Oct 2022 11:42:02 +1100
Subject: [PATCH] New package: yabridge-4.0.2
---
.../patches/01-rtlimit_rttime-musl-fix.patch | 39 ++++++++++
.../yabridge/patches/wine-version-check.diff | 11 +++
srcpkgs/yabridge/template | 75 +++++++++++++++++++
srcpkgs/yabridgectl | 1 +
4 files changed, 126 insertions(+)
create mode 100644 srcpkgs/yabridge/patches/01-rtlimit_rttime-musl-fix.patch
create mode 100644 srcpkgs/yabridge/patches/wine-version-check.diff
create mode 100644 srcpkgs/yabridge/template
create mode 120000 srcpkgs/yabridgectl
diff --git a/srcpkgs/yabridge/patches/01-rtlimit_rttime-musl-fix.patch b/srcpkgs/yabridge/patches/01-rtlimit_rttime-musl-fix.patch
new file mode 100644
index 000000000000..f8916369060b
--- /dev/null
+++ b/srcpkgs/yabridge/patches/01-rtlimit_rttime-musl-fix.patch
@@ -0,0 +1,39 @@
+From 616df46cb6f4e73efa9db524957765f28a6b713d Mon Sep 17 00:00:00 2001
+From: Anthony Thompson <athompson@posteo.net>
+Date: Mon, 24 Oct 2022 11:37:59 +1100
+Subject: [PATCH] fix RTLIMIT_RTTIME not in scope for musl
+
+---
+ src/common/utils.cpp | 2 +-
+ src/wine-host/utils.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/common/utils.cpp b/src/common/utils.cpp
+index c98e0d27..0de4c793 100644
+--- a/src/common/utils.cpp
++++ b/src/common/utils.cpp
+@@ -17,7 +17,7 @@
+ #include "utils.h"
+
+ #include <stdlib.h>
+-
++#include <asm-generic/resource.h>
+ #include <sched.h>
+ #include <xmmintrin.h>
+
+diff --git a/src/wine-host/utils.cpp b/src/wine-host/utils.cpp
+index f1038174..d415ccde 100644
+--- a/src/wine-host/utils.cpp
++++ b/src/wine-host/utils.cpp
+@@ -17,7 +17,7 @@
+ #include "utils.h"
+
+ #include <iostream>
+-
++#include <asm-generic/resource.h>
+ #include "bridges/common.h"
+
+ using namespace std::literals::chrono_literals;
+--
+2.38.1
+
diff --git a/srcpkgs/yabridge/patches/wine-version-check.diff b/srcpkgs/yabridge/patches/wine-version-check.diff
new file mode 100644
index 000000000000..86fae294d6c2
--- /dev/null
+++ b/srcpkgs/yabridge/patches/wine-version-check.diff
@@ -0,0 +1,11 @@
+--- a/meson.build 2022-06-27 23:54:16.000000000 +1000
++++ b/meson.build 2022-10-03 11:53:08.442051982 +1100
+@@ -135,7 +135,7 @@
+ #
+ # https://bugs.winehq.org/show_bug.cgi?id=49138
+ wine_version = run_command(
+- 'sh', '-c', '''wine --version | grep --only-matching -P '[0-9]+\.[0-9]+' | head -n1''',
++ 'sh', '-c', '''wine --version | grep --only-matching -E '[0-9]+\.[0-9]+' | head -n1''',
+ check : false
+ )
+ if wine_version.returncode() == 0
diff --git a/srcpkgs/yabridge/template b/srcpkgs/yabridge/template
new file mode 100644
index 000000000000..d44bd4be5b95
--- /dev/null
+++ b/srcpkgs/yabridge/template
@@ -0,0 +1,75 @@
+# Template file for 'yabridge'
+pkgname=yabridge
+version=4.0.2
+revision=1
+archs="i686* x86_64*"
+build_style=meson
+
+short_desc="Use Windows 32bit and 64bit VST2 and VST3 plugins in Linux"
+maintainer="Anthony Thompson <athompson@posteo.net>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/robbert-vdh/yabridge"
+distfiles="https://github.com/robbert-vdh/yabridge/archive/refs/tags/${version}.tar.gz"
+checksum=86fcd65b6f3dd5cf60c2afa476f63959a2cc4ef4d4629810916739d7af645f01
+build_options_default="with_32bit"
+build_options="with_32bit"
+
+if [ $XBPS_MACHINE = "x86_64-musl" ]; then
+ build_options="~with_32bit"
+fi
+
+if [ $XBPS_MACHINE = "i686" ] || [ $XBPS_MACHINE = "x86_64-musl" ]; then
+ hostmakedepends="ninja pkg-config cmake git cargo"
+ makedepends="wine-tools wine-devel libxcb-devel libxcb"
+ depends="wine yabridgectl"
+
+ elif [ $XBPS_LIBC = "glibc" ]; then
+ hostmakedepends="ninja cargo pkg-config cmake git $(vopt_if with_32bit "gcc-multilib")"
+ makedepends="wine-tools wine-devel libxcb-devel libxcb $(vopt_if with_32bit "wine-devel-32bit") $(vopt_if with_32bit "libxcb-devel-32bit")"
+ depends="wine $(vopt_if with_32bit "wine-32bit") yabridgectl"
+
+fi
+
+yabridgectl_package() {
+ shortdesc+="Utility to setup and manage yabridge"
+ depends="${sourcepkg}"
+ pkg_install() {
+ cd ${wrksrc}/tools/yabridgectl/target/release
+ vbin yabridgectl
+ }
+}
+
+do_configure() {
+ cd ${wrksrc}
+ if [ $XBPS_MACHINE = "i686" ]; then
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 -Dbitbridge=true -Dbuild.cpp_args='-m32' -Dbuild.cpp_link_args='-m32'
+ else
+ meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=1000 $(vopt_if with_32bit "-Dbitbridge=true")
+ fi
+}
+
+do_build() {
+ ninja -C build/
+ cd ${wrksrc}/tools/yabridgectl
+ cargo build --release
+}
+
+do_install() {
+ cd ${wrksrc}/build
+ if [ $XBPS_MACHINE = "x86_64-musl" ] || [ $XBPS_MACHINE = "x86_64" ]; then
+ vbin yabridge-host.exe
+ vbin yabridge-host.exe.so
+ if [ [ $(vopt_if with_32bit true false) = "true" ] && [ $XBPS_LIBC = "glibc"] ]; then
+ vbin yabridge-host-32.exe.so
+ vbin yabridge-host-32.exe
+ fi
+ else
+ vbin yabridge-host-32.exe.so
+ vbin yabridge-host-32.exe
+ fi
+ vmkdir usr/lib
+ vcopy libyabridge-chainloader-vst2.so /usr/lib
+ vcopy libyabridge-vst2.so /usr/lib
+ vcopy libyabridge-chainloader-vst3.so /usr/lib
+ vcopy libyabridge-vst3.so /usr/lib
+}
diff --git a/srcpkgs/yabridgectl b/srcpkgs/yabridgectl
new file mode 120000
index 000000000000..142ce41a5d93
--- /dev/null
+++ b/srcpkgs/yabridgectl
@@ -0,0 +1 @@
+yabridge/
\ No newline at end of file
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (29 preceding siblings ...)
2022-10-27 21:23 ` ajtcode71
@ 2022-10-27 21:28 ` ajtcode71
2022-11-10 11:08 ` ajtcode71
` (3 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-10-27 21:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
New comment by ajtcode71 on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#issuecomment-1294082877
Comment:
Complete redo.
Compiles with i686, x86_64 and x86_64-musl.
Now includes yabridgectl as a sub package rather than the separate build ( #39476 ). Obviously if this is accepted the yabridgectl PR will need to be closed.
Template handles the following :
i686 - with 32bit and 64bit VST support.
x86_64 -32bit bit and 64bit VST support - option to disable 32bit VST support.
x86_64-musl - with 64bit VST support only.
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (30 preceding siblings ...)
2022-10-27 21:28 ` ajtcode71
@ 2022-11-10 11:08 ` ajtcode71
2023-02-09 2:35 ` github-actions
` (2 subsequent siblings)
34 siblings, 0 replies; 36+ messages in thread
From: ajtcode71 @ 2022-11-10 11:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New comment by ajtcode71 on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#issuecomment-1310121143
Comment:
Any feedback on the new template? Let me know what needs to be done to get this merged.
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (31 preceding siblings ...)
2022-11-10 11:08 ` ajtcode71
@ 2023-02-09 2:35 ` github-actions
2023-02-24 2:00 ` [PR PATCH] [Closed]: " github-actions
2023-03-04 12:17 ` prez
34 siblings, 0 replies; 36+ messages in thread
From: github-actions @ 2023-02-09 2:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#issuecomment-1423532313
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: [PR PATCH] [Closed]: New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (32 preceding siblings ...)
2023-02-09 2:35 ` github-actions
@ 2023-02-24 2:00 ` github-actions
2023-03-04 12:17 ` prez
34 siblings, 0 replies; 36+ messages in thread
From: github-actions @ 2023-02-24 2:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 589 bytes --]
There's a closed pull request on the void-packages repository
New package: yabridge-4.0.2
https://github.com/void-linux/void-packages/pull/39475
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: New package: yabridge-4.0.2
2022-09-26 8:12 [PR PATCH] New package: yabridge-4.0.2 ajtcode71
` (33 preceding siblings ...)
2023-02-24 2:00 ` [PR PATCH] [Closed]: " github-actions
@ 2023-03-04 12:17 ` prez
34 siblings, 0 replies; 36+ messages in thread
From: prez @ 2023-03-04 12:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New comment by prez on void-packages repository
https://github.com/void-linux/void-packages/pull/39475#issuecomment-1454721060
Comment:
Is there any chance you can update this to a recent yabridge and rebase this on the latest master please?
^ permalink raw reply [flat|nested] 36+ messages in thread