Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] wineasio: update to 1.1.0.
@ 2023-02-10 11:16 oreo639
  2023-02-10 11:18 ` [PR PATCH] [Updated] " oreo639
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: oreo639 @ 2023-02-10 11:16 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages wineasio
https://github.com/void-linux/void-packages/pull/42181

wineasio: update to 1.1.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Keep in mind that for using the 32-bit wineasio on pipewire, you need to make sure the 32-bit libjack-pipewire libs get loaded before the regular libjack (either through `LD_LIBRARY_PATH='/usr/lib32/pipewire-0.3/jack' wine <...>` or ldconfig)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 643beb21d3dfdc3ce952c74058297d653c8b6758 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 10 Feb 2023 03:04:14 -0800
Subject: [PATCH 1/2] rtaudio: update to 5.2.0.

---
 srcpkgs/rtaudio/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/rtaudio/template b/srcpkgs/rtaudio/template
index 359e0ebb3f54..480fd71330ff 100644
--- a/srcpkgs/rtaudio/template
+++ b/srcpkgs/rtaudio/template
@@ -1,9 +1,9 @@
 # Template file for 'rtaudio'
 pkgname=rtaudio
-version=5.1.0
+version=5.2.0
 revision=1
-build_style=gnu-configure
-configure_args="--with-alsa --with-jack --with-pulse"
+build_style=meson
+configure_args="-Dalsa=enabled -Djack=enabled -Dpulse=enabled"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel pulseaudio-devel jack-devel"
 short_desc="C++ classes for common Linux, MacOS and Windows realtime audio APIs"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.music.mcgill.ca/~gary/rtaudio/"
 distfiles="http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-${version}.tar.gz"
-checksum=ff138b2b6ed2b700b04b406be718df213052d4c952190280cf4e2fab4b61fe09
+checksum=d6089c214e5dbff136ab21f3f5efc284e93475ebd198c54d4b9b6c44419ef4e6
 
 post_install() {
 	sed -n '/Copyright/,/IN THE SOFTWARE/p' RtAudio.h > LICENSE

From e149aa95b1288f947284584c8899e5e59d477b08 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 10 Feb 2023 03:04:59 -0800
Subject: [PATCH 2/2] wineasio: update to 1.1.0.

---
 srcpkgs/wineasio/patches/wine-unicode_h.patch | 59 -------------------
 srcpkgs/wineasio/template                     | 40 ++++++-------
 2 files changed, 19 insertions(+), 80 deletions(-)
 delete mode 100644 srcpkgs/wineasio/patches/wine-unicode_h.patch

diff --git a/srcpkgs/wineasio/patches/wine-unicode_h.patch b/srcpkgs/wineasio/patches/wine-unicode_h.patch
deleted file mode 100644
index 3f66a150f38e..000000000000
--- a/srcpkgs/wineasio/patches/wine-unicode_h.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: wine/unicode.h does not exist anymore and also strrchrW()
-        is not available. Replace the code with a simple linear
-        scan over the application_path array to find the rightmost
-        backslash (\) and period (.) for creating the application_name.
-
---- a/wineasio/asio.c	2013-10-28 15:22:00.000000000 +0100
-+++ b/wineasio/asio.c	2021-02-07 21:18:46.741180398 +0100
-@@ -24,6 +24,7 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
-+#define _UNICODE
- #include <stdio.h>
- #include <errno.h>
- #include <unistd.h>
-@@ -34,7 +35,6 @@
- #include "objbase.h"
- #include "mmsystem.h"
- #include "winreg.h"
--#include "wine/unicode.h"
- 
- #include <jack/jack.h>
- #include <jack/thread.h>
-@@ -1449,7 +1449,7 @@
- {
-     HKEY    hkey;
-     LONG    result, value;
--    DWORD   type, size;
-+    DWORD   type, size, pos, backslash, period;
-     WCHAR   application_path [MAX_PATH];
-     WCHAR   *application_name;
-     char    environment_variable[MAX_ENVIRONMENT_SIZE];
-@@ -1601,10 +1601,20 @@
- 
-     /* get client name by stripping path and extension */
-     GetModuleFileNameW(0, application_path, MAX_PATH);
--    application_name = strrchrW(application_path, L'.');
--    *application_name = 0;
--    application_name = strrchrW(application_path, L'\\');
--    application_name++;
-+    backslash = 0;
-+    period = 0;
-+    for (pos = 0; pos < MAX_PATH; pos++) {
-+        if (L'\\' == application_path[pos])
-+            backslash = pos;
-+        if (L'.' == application_path[pos])
-+            period = pos;
-+        if (0 == application_path[pos])
-+            break;
-+    }
-+    if (period > 0) {
-+        application_path[period] = 0;
-+    }
-+    application_name = backslash ? &application_path[backslash + 1] : application_path;
-     WideCharToMultiByte(CP_ACP, WC_SEPCHARS, application_name, -1, This->jack_client_name, ASIO_MAX_NAME_LENGTH, NULL, NULL);
- 
-     RegCloseKey(hkey);
diff --git a/srcpkgs/wineasio/template b/srcpkgs/wineasio/template
index bc529e72b3cc..c31c46b03cfa 100644
--- a/srcpkgs/wineasio/template
+++ b/srcpkgs/wineasio/template
@@ -1,30 +1,28 @@
 # Template file for 'wineasio'
 pkgname=wineasio
-version=0.9.2
-revision=7
-archs="i686"
-repository="nonfree"
+version=1.1.0
+revision=1
 build_style=gnu-makefile
-create_wrksrc=yes
-build_wrksrc=${pkgname}
-homepage="https://sourceforge.net/projects/wineasio"
-hostmakedepends="unzip wine-tools"
-makedepends="wine wine-devel jack-devel"
-depends="jack"
+make_build_target="${XBPS_TARGET_WORDSIZE}"
+hostmakedepends="pkg-config wine-tools"
+makedepends="wine wine-devel rtaudio-devel jack-devel"
 short_desc="JACK driver for WINE to provide Windows Apps with ASIO support"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1, Steinberg"
-distfiles="${SOURCEFORGE_SITE}/wineasio/${pkgname}-${version}.tar.gz
-	https://www.steinberg.net/sdk_downloads/asiosdk2.3.zip"
-checksum="9fbc2d10a4cec307dc0558bed82b887c864424d16da40a80f1d80f907d92af0b
-	69225020e9144af568784c6076b55939a55369edaf0ffcdf4d5e5b5898f31b9b"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/wineasio/wineasio"
+distfiles="https://github.com/wineasio/wineasio/releases/download/v${version}/wineasio-${version}.tar.gz"
+checksum="aa26ec986878d3fee1b99d0b31d0085379a78fcace20defbaf9627f007e2f2cc"
+depends="jack"
 
-pre_configure() {
-	cp -v ../ASIOSDK2.3/common/asio.h asio.h
-}
+archs="x86_64* i686*"
+lib32mode=full
 
 do_install() {
-	vinstall wineasio.dll.so 755 usr/lib/wine
-	vinstall README 644 usr/share/wineasio
-	vlicense "../ASIOSDK2.3/Steinberg ASIO Licensing Agreement.pdf"
+	local winearch
+	case $XBPS_TARGET_MACHINE in
+		x86_64*) winearch="x86_64" ;;
+		i686*) winearch="i386" ;;
+	esac
+	vinstall "build${XBPS_TARGET_WORDSIZE}"/wineasio.dll 755 usr/lib/wine/${winearch}-windows
+	vinstall "build${XBPS_TARGET_WORDSIZE}"/wineasio.dll.so 755 usr/lib/wine/${winearch}-unix
 }

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] wineasio: update to 1.1.0.
  2023-02-10 11:16 [PR PATCH] wineasio: update to 1.1.0 oreo639
@ 2023-02-10 11:18 ` oreo639
  2023-02-16  2:12 ` [PR REVIEW] " classabbyamp
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: oreo639 @ 2023-02-10 11:18 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages wineasio
https://github.com/void-linux/void-packages/pull/42181

wineasio: update to 1.1.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Keep in mind that for using the 32-bit wineasio on pipewire, you need to make sure the 32-bit libjack-pipewire libs get loaded before the regular libjack (either through `LD_LIBRARY_PATH='/usr/lib32/pipewire-0.3/jack' wine <...>` or ldconfig)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 643beb21d3dfdc3ce952c74058297d653c8b6758 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 10 Feb 2023 03:04:14 -0800
Subject: [PATCH 1/2] rtaudio: update to 5.2.0.

---
 srcpkgs/rtaudio/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/rtaudio/template b/srcpkgs/rtaudio/template
index 359e0ebb3f54..480fd71330ff 100644
--- a/srcpkgs/rtaudio/template
+++ b/srcpkgs/rtaudio/template
@@ -1,9 +1,9 @@
 # Template file for 'rtaudio'
 pkgname=rtaudio
-version=5.1.0
+version=5.2.0
 revision=1
-build_style=gnu-configure
-configure_args="--with-alsa --with-jack --with-pulse"
+build_style=meson
+configure_args="-Dalsa=enabled -Djack=enabled -Dpulse=enabled"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel pulseaudio-devel jack-devel"
 short_desc="C++ classes for common Linux, MacOS and Windows realtime audio APIs"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.music.mcgill.ca/~gary/rtaudio/"
 distfiles="http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-${version}.tar.gz"
-checksum=ff138b2b6ed2b700b04b406be718df213052d4c952190280cf4e2fab4b61fe09
+checksum=d6089c214e5dbff136ab21f3f5efc284e93475ebd198c54d4b9b6c44419ef4e6
 
 post_install() {
 	sed -n '/Copyright/,/IN THE SOFTWARE/p' RtAudio.h > LICENSE

From 4e8e87161f47a4d4a21a1194ceefb8d3fc88d2d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 10 Feb 2023 03:04:59 -0800
Subject: [PATCH 2/2] wineasio: update to 1.1.0.

---
 srcpkgs/wineasio/patches/wine-unicode_h.patch | 59 -------------------
 srcpkgs/wineasio/template                     | 38 ++++++------
 2 files changed, 18 insertions(+), 79 deletions(-)
 delete mode 100644 srcpkgs/wineasio/patches/wine-unicode_h.patch

diff --git a/srcpkgs/wineasio/patches/wine-unicode_h.patch b/srcpkgs/wineasio/patches/wine-unicode_h.patch
deleted file mode 100644
index 3f66a150f38e..000000000000
--- a/srcpkgs/wineasio/patches/wine-unicode_h.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: wine/unicode.h does not exist anymore and also strrchrW()
-        is not available. Replace the code with a simple linear
-        scan over the application_path array to find the rightmost
-        backslash (\) and period (.) for creating the application_name.
-
---- a/wineasio/asio.c	2013-10-28 15:22:00.000000000 +0100
-+++ b/wineasio/asio.c	2021-02-07 21:18:46.741180398 +0100
-@@ -24,6 +24,7 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
-+#define _UNICODE
- #include <stdio.h>
- #include <errno.h>
- #include <unistd.h>
-@@ -34,7 +35,6 @@
- #include "objbase.h"
- #include "mmsystem.h"
- #include "winreg.h"
--#include "wine/unicode.h"
- 
- #include <jack/jack.h>
- #include <jack/thread.h>
-@@ -1449,7 +1449,7 @@
- {
-     HKEY    hkey;
-     LONG    result, value;
--    DWORD   type, size;
-+    DWORD   type, size, pos, backslash, period;
-     WCHAR   application_path [MAX_PATH];
-     WCHAR   *application_name;
-     char    environment_variable[MAX_ENVIRONMENT_SIZE];
-@@ -1601,10 +1601,20 @@
- 
-     /* get client name by stripping path and extension */
-     GetModuleFileNameW(0, application_path, MAX_PATH);
--    application_name = strrchrW(application_path, L'.');
--    *application_name = 0;
--    application_name = strrchrW(application_path, L'\\');
--    application_name++;
-+    backslash = 0;
-+    period = 0;
-+    for (pos = 0; pos < MAX_PATH; pos++) {
-+        if (L'\\' == application_path[pos])
-+            backslash = pos;
-+        if (L'.' == application_path[pos])
-+            period = pos;
-+        if (0 == application_path[pos])
-+            break;
-+    }
-+    if (period > 0) {
-+        application_path[period] = 0;
-+    }
-+    application_name = backslash ? &application_path[backslash + 1] : application_path;
-     WideCharToMultiByte(CP_ACP, WC_SEPCHARS, application_name, -1, This->jack_client_name, ASIO_MAX_NAME_LENGTH, NULL, NULL);
- 
-     RegCloseKey(hkey);
diff --git a/srcpkgs/wineasio/template b/srcpkgs/wineasio/template
index bc529e72b3cc..bee6eeb43bee 100644
--- a/srcpkgs/wineasio/template
+++ b/srcpkgs/wineasio/template
@@ -1,30 +1,28 @@
 # Template file for 'wineasio'
 pkgname=wineasio
-version=0.9.2
-revision=7
-archs="i686"
-repository="nonfree"
+version=1.1.0
+revision=1
 build_style=gnu-makefile
-create_wrksrc=yes
-build_wrksrc=${pkgname}
-homepage="https://sourceforge.net/projects/wineasio"
-hostmakedepends="unzip wine-tools"
-makedepends="wine wine-devel jack-devel"
+make_build_target="${XBPS_TARGET_WORDSIZE}"
+hostmakedepends="pkg-config wine-tools"
+makedepends="wine wine-devel rtaudio-devel jack-devel"
 depends="jack"
 short_desc="JACK driver for WINE to provide Windows Apps with ASIO support"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1, Steinberg"
-distfiles="${SOURCEFORGE_SITE}/wineasio/${pkgname}-${version}.tar.gz
-	https://www.steinberg.net/sdk_downloads/asiosdk2.3.zip"
-checksum="9fbc2d10a4cec307dc0558bed82b887c864424d16da40a80f1d80f907d92af0b
-	69225020e9144af568784c6076b55939a55369edaf0ffcdf4d5e5b5898f31b9b"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/wineasio/wineasio"
+distfiles="https://github.com/wineasio/wineasio/releases/download/v${version}/wineasio-${version}.tar.gz"
+checksum="aa26ec986878d3fee1b99d0b31d0085379a78fcace20defbaf9627f007e2f2cc"
 
-pre_configure() {
-	cp -v ../ASIOSDK2.3/common/asio.h asio.h
-}
+archs="x86_64* i686*"
+lib32mode=full
 
 do_install() {
-	vinstall wineasio.dll.so 755 usr/lib/wine
-	vinstall README 644 usr/share/wineasio
-	vlicense "../ASIOSDK2.3/Steinberg ASIO Licensing Agreement.pdf"
+	local winearch
+	case $XBPS_TARGET_MACHINE in
+		x86_64*) winearch="x86_64" ;;
+		i686*) winearch="i386" ;;
+	esac
+	vinstall "build${XBPS_TARGET_WORDSIZE}"/wineasio.dll 755 usr/lib/wine/${winearch}-windows
+	vinstall "build${XBPS_TARGET_WORDSIZE}"/wineasio.dll.so 755 usr/lib/wine/${winearch}-unix
 }

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PR REVIEW] wineasio: update to 1.1.0.
  2023-02-10 11:16 [PR PATCH] wineasio: update to 1.1.0 oreo639
  2023-02-10 11:18 ` [PR PATCH] [Updated] " oreo639
@ 2023-02-16  2:12 ` classabbyamp
  2023-02-16  2:18 ` [PR PATCH] [Updated] " oreo639
  2023-02-16  2:37 ` [PR PATCH] [Merged]: " classabbyamp
  3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2023-02-16  2:12 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42181#discussion_r1107934053

Comment:
put this after revision

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] wineasio: update to 1.1.0.
  2023-02-10 11:16 [PR PATCH] wineasio: update to 1.1.0 oreo639
  2023-02-10 11:18 ` [PR PATCH] [Updated] " oreo639
  2023-02-16  2:12 ` [PR REVIEW] " classabbyamp
@ 2023-02-16  2:18 ` oreo639
  2023-02-16  2:37 ` [PR PATCH] [Merged]: " classabbyamp
  3 siblings, 0 replies; 5+ messages in thread
From: oreo639 @ 2023-02-16  2:18 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages wineasio
https://github.com/void-linux/void-packages/pull/42181

wineasio: update to 1.1.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Keep in mind that for using the 32-bit wineasio on pipewire, you need to make sure the 32-bit libjack-pipewire libs get loaded before the regular libjack (either through `LD_LIBRARY_PATH='/usr/lib32/pipewire-0.3/jack' wine <...>` or ldconfig)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From fe155ed86c712cab8ff1cf801243f3c7ee62656c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 10 Feb 2023 03:04:14 -0800
Subject: [PATCH 1/2] rtaudio: update to 5.2.0.

---
 srcpkgs/rtaudio/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/rtaudio/template b/srcpkgs/rtaudio/template
index 359e0ebb3f54..480fd71330ff 100644
--- a/srcpkgs/rtaudio/template
+++ b/srcpkgs/rtaudio/template
@@ -1,9 +1,9 @@
 # Template file for 'rtaudio'
 pkgname=rtaudio
-version=5.1.0
+version=5.2.0
 revision=1
-build_style=gnu-configure
-configure_args="--with-alsa --with-jack --with-pulse"
+build_style=meson
+configure_args="-Dalsa=enabled -Djack=enabled -Dpulse=enabled"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel pulseaudio-devel jack-devel"
 short_desc="C++ classes for common Linux, MacOS and Windows realtime audio APIs"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.music.mcgill.ca/~gary/rtaudio/"
 distfiles="http://www.music.mcgill.ca/~gary/rtaudio/release/rtaudio-${version}.tar.gz"
-checksum=ff138b2b6ed2b700b04b406be718df213052d4c952190280cf4e2fab4b61fe09
+checksum=d6089c214e5dbff136ab21f3f5efc284e93475ebd198c54d4b9b6c44419ef4e6
 
 post_install() {
 	sed -n '/Copyright/,/IN THE SOFTWARE/p' RtAudio.h > LICENSE

From 237bc67075c598dc1069e6be6f7375879e92ab97 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 10 Feb 2023 03:04:59 -0800
Subject: [PATCH 2/2] wineasio: update to 1.1.0.

---
 srcpkgs/wineasio/patches/wine-unicode_h.patch | 59 -------------------
 srcpkgs/wineasio/template                     | 39 ++++++------
 2 files changed, 18 insertions(+), 80 deletions(-)
 delete mode 100644 srcpkgs/wineasio/patches/wine-unicode_h.patch

diff --git a/srcpkgs/wineasio/patches/wine-unicode_h.patch b/srcpkgs/wineasio/patches/wine-unicode_h.patch
deleted file mode 100644
index 3f66a150f38e..000000000000
--- a/srcpkgs/wineasio/patches/wine-unicode_h.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: wine/unicode.h does not exist anymore and also strrchrW()
-        is not available. Replace the code with a simple linear
-        scan over the application_path array to find the rightmost
-        backslash (\) and period (.) for creating the application_name.
-
---- a/wineasio/asio.c	2013-10-28 15:22:00.000000000 +0100
-+++ b/wineasio/asio.c	2021-02-07 21:18:46.741180398 +0100
-@@ -24,6 +24,7 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
-+#define _UNICODE
- #include <stdio.h>
- #include <errno.h>
- #include <unistd.h>
-@@ -34,7 +35,6 @@
- #include "objbase.h"
- #include "mmsystem.h"
- #include "winreg.h"
--#include "wine/unicode.h"
- 
- #include <jack/jack.h>
- #include <jack/thread.h>
-@@ -1449,7 +1449,7 @@
- {
-     HKEY    hkey;
-     LONG    result, value;
--    DWORD   type, size;
-+    DWORD   type, size, pos, backslash, period;
-     WCHAR   application_path [MAX_PATH];
-     WCHAR   *application_name;
-     char    environment_variable[MAX_ENVIRONMENT_SIZE];
-@@ -1601,10 +1601,20 @@
- 
-     /* get client name by stripping path and extension */
-     GetModuleFileNameW(0, application_path, MAX_PATH);
--    application_name = strrchrW(application_path, L'.');
--    *application_name = 0;
--    application_name = strrchrW(application_path, L'\\');
--    application_name++;
-+    backslash = 0;
-+    period = 0;
-+    for (pos = 0; pos < MAX_PATH; pos++) {
-+        if (L'\\' == application_path[pos])
-+            backslash = pos;
-+        if (L'.' == application_path[pos])
-+            period = pos;
-+        if (0 == application_path[pos])
-+            break;
-+    }
-+    if (period > 0) {
-+        application_path[period] = 0;
-+    }
-+    application_name = backslash ? &application_path[backslash + 1] : application_path;
-     WideCharToMultiByte(CP_ACP, WC_SEPCHARS, application_name, -1, This->jack_client_name, ASIO_MAX_NAME_LENGTH, NULL, NULL);
- 
-     RegCloseKey(hkey);
diff --git a/srcpkgs/wineasio/template b/srcpkgs/wineasio/template
index bc529e72b3cc..3bcbe592a70b 100644
--- a/srcpkgs/wineasio/template
+++ b/srcpkgs/wineasio/template
@@ -1,30 +1,27 @@
 # Template file for 'wineasio'
 pkgname=wineasio
-version=0.9.2
-revision=7
-archs="i686"
-repository="nonfree"
+version=1.1.0
+revision=1
+archs="x86_64* i686*"
 build_style=gnu-makefile
-create_wrksrc=yes
-build_wrksrc=${pkgname}
-homepage="https://sourceforge.net/projects/wineasio"
-hostmakedepends="unzip wine-tools"
-makedepends="wine wine-devel jack-devel"
+make_build_target="${XBPS_TARGET_WORDSIZE}"
+hostmakedepends="pkg-config wine-tools"
+makedepends="wine wine-devel rtaudio-devel jack-devel"
 depends="jack"
 short_desc="JACK driver for WINE to provide Windows Apps with ASIO support"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1, Steinberg"
-distfiles="${SOURCEFORGE_SITE}/wineasio/${pkgname}-${version}.tar.gz
-	https://www.steinberg.net/sdk_downloads/asiosdk2.3.zip"
-checksum="9fbc2d10a4cec307dc0558bed82b887c864424d16da40a80f1d80f907d92af0b
-	69225020e9144af568784c6076b55939a55369edaf0ffcdf4d5e5b5898f31b9b"
-
-pre_configure() {
-	cp -v ../ASIOSDK2.3/common/asio.h asio.h
-}
+license="LGPL-2.1-or-later"
+homepage="https://github.com/wineasio/wineasio"
+distfiles="https://github.com/wineasio/wineasio/releases/download/v${version}/wineasio-${version}.tar.gz"
+checksum="aa26ec986878d3fee1b99d0b31d0085379a78fcace20defbaf9627f007e2f2cc"
+lib32mode=full
 
 do_install() {
-	vinstall wineasio.dll.so 755 usr/lib/wine
-	vinstall README 644 usr/share/wineasio
-	vlicense "../ASIOSDK2.3/Steinberg ASIO Licensing Agreement.pdf"
+	local winearch
+	case $XBPS_TARGET_MACHINE in
+		x86_64*) winearch="x86_64" ;;
+		i686*) winearch="i386" ;;
+	esac
+	vinstall "build${XBPS_TARGET_WORDSIZE}"/wineasio.dll 755 usr/lib/wine/${winearch}-windows
+	vinstall "build${XBPS_TARGET_WORDSIZE}"/wineasio.dll.so 755 usr/lib/wine/${winearch}-unix
 }

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: wineasio: update to 1.1.0.
  2023-02-10 11:16 [PR PATCH] wineasio: update to 1.1.0 oreo639
                   ` (2 preceding siblings ...)
  2023-02-16  2:18 ` [PR PATCH] [Updated] " oreo639
@ 2023-02-16  2:37 ` classabbyamp
  3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2023-02-16  2:37 UTC (permalink / raw)
  To: ml

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

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

wineasio: update to 1.1.0.
https://github.com/void-linux/void-packages/pull/42181

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Keep in mind that for using the 32-bit wineasio on pipewire, you need to make sure the 32-bit libjack-pipewire libs get loaded before the regular libjack (either through `LD_LIBRARY_PATH='/usr/lib32/pipewire-0.3/jack' wine <...>` or ldconfig)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-02-16  2:37 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-10 11:16 [PR PATCH] wineasio: update to 1.1.0 oreo639
2023-02-10 11:18 ` [PR PATCH] [Updated] " oreo639
2023-02-16  2:12 ` [PR REVIEW] " classabbyamp
2023-02-16  2:18 ` [PR PATCH] [Updated] " oreo639
2023-02-16  2:37 ` [PR PATCH] [Merged]: " classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).