diff --git a/srcpkgs/wineasio/files/README.voidlinux b/srcpkgs/wineasio/files/README.voidlinux index 6d3193b5fb0..d6b6b01aa5f 100644 --- a/srcpkgs/wineasio/files/README.voidlinux +++ b/srcpkgs/wineasio/files/README.voidlinux @@ -1,4 +1,4 @@ -Be sure to run 'regsvr32 wineasio.dll' as your user before use! +Be sure to run 'wineasio-register' 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/fix-install-paths.patch b/srcpkgs/wineasio/patches/fix-install-paths.patch new file mode 100644 index 00000000000..71d5bf2cf1b --- /dev/null +++ b/srcpkgs/wineasio/patches/fix-install-paths.patch @@ -0,0 +1,30 @@ +Upstream assumes using new wine64 implementation, which we only enable for musl atm. + +Install dlls to both locations for now. + +From 0930d9cfddbe43a3e3ed4ca29acdb87748570d9e Mon Sep 17 00:00:00 2001 +From: "S. Christian Collins" +Date: Fri, 17 Nov 2023 00:27:39 -0600 +Subject: [PATCH] fix 32-bit DLL location for multiarch Wine + +--- + wineasio-register | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/wineasio-register b/wineasio-register +index 862fb0e..c7fbe73 100755 +--- a/wineasio-register ++++ b/wineasio-register +@@ -34,7 +34,11 @@ u64=( + for u in ${u32[@]}; do + w=$(echo ${u} | sed -e 's|/i386-unix/wineasio32.dll.so|/i386-windows/wineasio32.dll|g') + if [ -e "${u}" ] && [ -e "${w}" ]; then +- cp -v "${w}" "${WINEPREFIX}/drive_c/windows/system32" ++ if command -v wine64 > /dev/null && [ -d "${WINEPREFIX}/drive_c/windows/syswow64" ]; then ++ cp -v "${w}" "${WINEPREFIX}/drive_c/windows/syswow64" ++ else ++ cp -v "${w}" "${WINEPREFIX}/drive_c/windows/system32" ++ fi + regsvr32 "${u}" + break + fi diff --git a/srcpkgs/wineasio/template b/srcpkgs/wineasio/template index 201d42621e2..74296eca9ce 100644 --- a/srcpkgs/wineasio/template +++ b/srcpkgs/wineasio/template @@ -1,6 +1,6 @@ # Template file for 'wineasio' pkgname=wineasio -version=1.1.0 +version=1.2.0 revision=1 archs="x86_64* i686*" build_style=gnu-makefile @@ -13,16 +13,19 @@ maintainer="Orphaned " 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 +checksum="13f20c7b3d45b474833e6c60cb58bcad7295e97dd39239bf00f85c02272cc0f4" + +case $XBPS_TARGET_MACHINE in + x86_64*) winearch="x86_64" ;; + i686*) winearch="i386" ;; + *) broken="unknown winearch" ;; +esac + +lib32files="/usr/lib/wine/${winearch}-windows/wineasio${XBPS_TARGET_WORDSIZE}.dll" do_install() { - 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 + vinstall "build${XBPS_TARGET_WORDSIZE}/wineasio${XBPS_TARGET_WORDSIZE}.dll" 755 usr/lib/wine/${winearch}-windows + vinstall "build${XBPS_TARGET_WORDSIZE}/wineasio${XBPS_TARGET_WORDSIZE}.dll.so" 755 usr/lib/wine/${winearch}-unix + vbin wineasio-register vdoc "${FILESDIR}/README.voidlinux" }