Re: [PR PATCH] [Updated] wineasio: update to 1.0.0

[heliocat <heliocat@users.noreply.github.com>]

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

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

https://github.com/heliocat/void-packages wineasio
https://github.com/void-linux/void-packages/pull/31696

wineasio: update to 1.0.0
Note that this moves the package out of nonfree since the vendored
realtime library changed. It's still vendored, but it's no longer
vendoring something with a restrictive license.

I wasn't sure about the suitability for cross compilation so I'm leaving
it as targetting x86 only, but it's now buildable for 64 bit as well.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

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

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (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/31696.patch is attached

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

From 381f300babfa40b4cf27b9a33fccc44a92dc2abe Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Mon, 28 Jun 2021 11:13:28 -0700
Subject: [PATCH] wineasio: update to 1.0.0

Note that this moves the package out of nonfree since the vendored
realtime library changed. It's still vendored, but it's no longer
vendoring something with a restrictive license.
---
 srcpkgs/wineasio/INSTALL.msg                  |  3 +-
 srcpkgs/wineasio/patches/wine-unicode_h.patch | 59 -------------------
 srcpkgs/wineasio/template                     | 37 ++++++------
 3 files changed, 21 insertions(+), 78 deletions(-)
 delete mode 100644 srcpkgs/wineasio/patches/wine-unicode_h.patch

diff --git a/srcpkgs/wineasio/INSTALL.msg b/srcpkgs/wineasio/INSTALL.msg
index 6d3193b5fb06..a36f74ee0219 100644
--- a/srcpkgs/wineasio/INSTALL.msg
+++ b/srcpkgs/wineasio/INSTALL.msg
@@ -1,4 +1,5 @@
-Be sure to run 'regsvr32 wineasio.dll' as your user before use!
+Be sure to run 'regsvr32 wineasio.dll' or 'wine64 regsvr32 wineasio.dll'
+as your user before use!
 
 You may also override the WINEPREFIX environment variable if your
 WINE installation is not installed in ~/.wine/
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..48ebaf677411 100644
--- a/srcpkgs/wineasio/template
+++ b/srcpkgs/wineasio/template
@@ -1,30 +1,31 @@
 # Template file for 'wineasio'
 pkgname=wineasio
-version=0.9.2
-revision=7
-archs="i686"
-repository="nonfree"
+version=1.0.0
+revision=1
 build_style=gnu-makefile
-create_wrksrc=yes
-build_wrksrc=${pkgname}
-homepage="https://sourceforge.net/projects/wineasio"
-hostmakedepends="unzip wine-tools"
+_rtaudio_ver=5.1.0
+hostmakedepends="unzip wine-tools pkg-config"
 makedepends="wine wine-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="GPL-2.0-or-later,  LGPL-2.1-or-later"
+homepage="https://sourceforge.net/projects/wineasio"
+distfiles="https://github.com/wineasio/wineasio/archive/refs/tags/v${version}.tar.gz
+ https://github.com/falkTX/rtaudio/archive/refs/tags/${_rtaudio_ver}.tar.gz"
+checksum="6938457947373c3c3411c69a9cd3a6835191a04ec694d477b0ecf59161a98d28
+ 42242eb0db5902166a38530c242567294510f57be22754cfafe31ed1f35b76bf"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686) make_build_target=32 ;;
+	x86_64) make_build_target=64 ;;
+esac
 
-pre_configure() {
-	cp -v ../ASIOSDK2.3/common/asio.h asio.h
+post_extract() {
+	cp -ar "${XBPS_BUILDDIR}/rtaudio-${_rtaudio_ver}"/* "${wrksrc}/rtaudio"
 }
 
 do_install() {
-	vinstall wineasio.dll.so 755 usr/lib/wine
-	vinstall README 644 usr/share/wineasio
-	vlicense "../ASIOSDK2.3/Steinberg ASIO Licensing Agreement.pdf"
+	vinstall build${make_build_target}/wineasio.dll.so 755 usr/lib/wine
+	vinstall README.md 644 usr/share/wineasio
 }