From 643beb21d3dfdc3ce952c74058297d653c8b6758 Mon Sep 17 00:00:00 2001 From: oreo639 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 " 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 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 - #include - #include -@@ -34,7 +35,6 @@ - #include "objbase.h" - #include "mmsystem.h" - #include "winreg.h" --#include "wine/unicode.h" - - #include - #include -@@ -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 " -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 }