* [PR PATCH] wineasio: update to 1.2.0.
@ 2024-03-19 2:42 oreo639
2024-04-17 2:59 ` [PR PATCH] [Merged]: " oreo639
0 siblings, 1 reply; 2+ messages in thread
From: oreo639 @ 2024-03-19 2:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1239 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/49362
wineasio: update to 1.2.0.
<!-- 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**|**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/49362.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wineasio-49362.patch --]
[-- Type: text/x-diff, Size: 3995 bytes --]
From 998148539a3f2baa1331be37f3446ff692a6a81e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 18 Mar 2024 18:45:08 -0700
Subject: [PATCH] wineasio: update to 1.2.0.
---
srcpkgs/wineasio/files/README.voidlinux | 2 +-
.../wineasio/patches/fix-install-paths.patch | 30 +++++++++++++++++++
srcpkgs/wineasio/template | 23 +++++++-------
3 files changed, 44 insertions(+), 11 deletions(-)
create mode 100644 srcpkgs/wineasio/patches/fix-install-paths.patch
diff --git a/srcpkgs/wineasio/files/README.voidlinux b/srcpkgs/wineasio/files/README.voidlinux
index 6d3193b5fb0662..d6b6b01aa5f234 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 00000000000000..71d5bf2cf1bb57
--- /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" <s_chriscollins@hotmail.com>
+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 201d42621e2f4e..74296eca9cec81 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 <orphan@voidlinux.org>"
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"
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: wineasio: update to 1.2.0.
2024-03-19 2:42 [PR PATCH] wineasio: update to 1.2.0 oreo639
@ 2024-04-17 2:59 ` oreo639
0 siblings, 0 replies; 2+ messages in thread
From: oreo639 @ 2024-04-17 2:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]
There's a merged pull request on the void-packages repository
wineasio: update to 1.2.0.
https://github.com/void-linux/void-packages/pull/49362
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**|**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] 2+ messages in thread
end of thread, other threads:[~2024-04-17 2:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-19 2:42 [PR PATCH] wineasio: update to 1.2.0 oreo639
2024-04-17 2:59 ` [PR PATCH] [Merged]: " oreo639
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).