* [PR PATCH] wine: fix faudio support
@ 2021-01-24 1:40 kaey
2021-01-24 2:10 ` ericonr
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: kaey @ 2021-01-24 1:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 751 bytes --]
There is a new pull request by kaey against master on the void-packages repository
https://github.com/kaey/void-packages wine-faudio
https://github.com/void-linux/void-packages/pull/28130
wine: fix faudio support
Fix for these two issues:
wine - configure: libFAudio 64-bit development files not found, XAudio2 won't be supported.
faudio - WARNING: Target "FAudio" requests linking to directory "/usr/lib". Targets may link only to libraries. CMake is dropping the item.
Currently built faudio lib is broken due to missing link to libSDL2.
I only tested on x86_64 and wine seems to build correctly.
I wasn't able to cross-compile wine for i686.
A patch file from https://github.com/void-linux/void-packages/pull/28130.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-faudio-28130.patch --]
[-- Type: text/x-diff, Size: 1620 bytes --]
From ccd418d647ef6e865e4b3ce85d34c8bfc1aba351 Mon Sep 17 00:00:00 2001
From: Konstantin Kulikov <k.kulikov2@gmail.com>
Date: Sun, 24 Jan 2021 04:31:51 +0300
Subject: [PATCH] wine: fix faudio support
Fix for these two issues:
wine - configure: libFAudio 64-bit development files not found, XAudio2 won't be supported.
faudio - WARNING: Target "FAudio" requests linking to directory "/usr/lib". Targets may link only to libraries. CMake is dropping the item.
Currently built faudio lib is broken due to missing link to libSDL2.
---
srcpkgs/FAudio/template | 4 ++--
srcpkgs/wine/template | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/FAudio/template b/srcpkgs/FAudio/template
index b60a953b4ca..846463ca51c 100644
--- a/srcpkgs/FAudio/template
+++ b/srcpkgs/FAudio/template
@@ -1,10 +1,10 @@
# Template file for 'FAudio'
pkgname=FAudio
version=20.11
-revision=1
+revision=2
build_style=cmake
configure_args="-DGSTREAMER=ON -DSDL2_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include/SDL2
- -DSDL2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib"
+ -DSDL2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libSDL2.so"
hostmakedepends="pkg-config"
makedepends="SDL2-devel gstreamer1-devel gst-plugins-base1-devel"
short_desc="Accuracy-focused XAudio reimplementation for open platforms"
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index e8b1fda250c..3694984c42d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=6.0
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: wine: fix faudio support
2021-01-24 1:40 [PR PATCH] wine: fix faudio support kaey
@ 2021-01-24 2:10 ` ericonr
2021-01-24 2:32 ` [PR PATCH] [Updated] " kaey
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2021-01-24 2:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28130#issuecomment-766275948
Comment:
Do you know how to split a commit? It should be one for each package, even if the final result is fixing a single problem.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] wine: fix faudio support
2021-01-24 1:40 [PR PATCH] wine: fix faudio support kaey
2021-01-24 2:10 ` ericonr
@ 2021-01-24 2:32 ` kaey
2021-01-24 2:35 ` kaey
2021-01-26 2:42 ` [PR PATCH] [Merged]: " ericonr
3 siblings, 0 replies; 5+ messages in thread
From: kaey @ 2021-01-24 2:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 756 bytes --]
There is an updated pull request by kaey against master on the void-packages repository
https://github.com/kaey/void-packages wine-faudio
https://github.com/void-linux/void-packages/pull/28130
wine: fix faudio support
Fix for these two issues:
wine - configure: libFAudio 64-bit development files not found, XAudio2 won't be supported.
faudio - WARNING: Target "FAudio" requests linking to directory "/usr/lib". Targets may link only to libraries. CMake is dropping the item.
Currently built faudio lib is broken due to missing link to libSDL2.
I only tested on x86_64 and wine seems to build correctly.
I wasn't able to cross-compile wine for i686.
A patch file from https://github.com/void-linux/void-packages/pull/28130.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-faudio-28130.patch --]
[-- Type: text/x-diff, Size: 1568 bytes --]
From 4a7d27919be860ba2a9d7f2f91c3270a1738e1e4 Mon Sep 17 00:00:00 2001
From: Konstantin Kulikov <k.kulikov2@gmail.com>
Date: Sun, 24 Jan 2021 05:25:10 +0300
Subject: [PATCH 1/2] FAudio: fix linking against libSDL
---
srcpkgs/FAudio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/FAudio/template b/srcpkgs/FAudio/template
index b60a953b4ca..846463ca51c 100644
--- a/srcpkgs/FAudio/template
+++ b/srcpkgs/FAudio/template
@@ -1,10 +1,10 @@
# Template file for 'FAudio'
pkgname=FAudio
version=20.11
-revision=1
+revision=2
build_style=cmake
configure_args="-DGSTREAMER=ON -DSDL2_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include/SDL2
- -DSDL2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib"
+ -DSDL2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libSDL2.so"
hostmakedepends="pkg-config"
makedepends="SDL2-devel gstreamer1-devel gst-plugins-base1-devel"
short_desc="Accuracy-focused XAudio reimplementation for open platforms"
From 0525c83db8df99e1fdf71988c56ebd34893ff9c7 Mon Sep 17 00:00:00 2001
From: Konstantin Kulikov <k.kulikov2@gmail.com>
Date: Sun, 24 Jan 2021 05:25:46 +0300
Subject: [PATCH 2/2] wine: rebuild against fixed FAudio
---
srcpkgs/wine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index e8b1fda250c..3694984c42d 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
# Template file for 'wine'
pkgname=wine
version=6.0
-revision=1
+revision=2
_pkgver=${version/r/-r}
create_wrksrc=yes
build_wrksrc=wine-${_pkgver}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: wine: fix faudio support
2021-01-24 1:40 [PR PATCH] wine: fix faudio support kaey
2021-01-24 2:10 ` ericonr
2021-01-24 2:32 ` [PR PATCH] [Updated] " kaey
@ 2021-01-24 2:35 ` kaey
2021-01-26 2:42 ` [PR PATCH] [Merged]: " ericonr
3 siblings, 0 replies; 5+ messages in thread
From: kaey @ 2021-01-24 2:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New comment by kaey on void-packages repository
https://github.com/void-linux/void-packages/pull/28130#issuecomment-766279577
Comment:
@ericonr Done.
I've also tested 64bit game in wine and it worked.
I don't have any 32bit games that depend on xaudio.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: wine: fix faudio support
2021-01-24 1:40 [PR PATCH] wine: fix faudio support kaey
` (2 preceding siblings ...)
2021-01-24 2:35 ` kaey
@ 2021-01-26 2:42 ` ericonr
3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2021-01-26 2:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 602 bytes --]
There's a merged pull request on the void-packages repository
wine: fix faudio support
https://github.com/void-linux/void-packages/pull/28130
Description:
Fix for these two issues:
wine - configure: libFAudio 64-bit development files not found, XAudio2 won't be supported.
faudio - WARNING: Target "FAudio" requests linking to directory "/usr/lib". Targets may link only to libraries. CMake is dropping the item.
Currently built faudio lib is broken due to missing link to libSDL2.
I only tested on x86_64 and wine seems to build correctly.
I wasn't able to cross-compile wine for i686.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-01-26 2:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-24 1:40 [PR PATCH] wine: fix faudio support kaey
2021-01-24 2:10 ` ericonr
2021-01-24 2:32 ` [PR PATCH] [Updated] " kaey
2021-01-24 2:35 ` kaey
2021-01-26 2:42 ` [PR PATCH] [Merged]: " ericonr
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).