From: kaey <kaey@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] wine: fix faudio support
Date: Sun, 24 Jan 2021 03:32:56 +0100 [thread overview]
Message-ID: <20210124023256.TV20p6Mg1NUyG6npvHXInH27SxyDIX6y5pqXMdviU5A@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28130@inbox.vuxu.org>
[-- 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}
next prev parent reply other threads:[~2021-01-24 2:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-24 1:40 [PR PATCH] " kaey
2021-01-24 2:10 ` ericonr
2021-01-24 2:32 ` kaey [this message]
2021-01-24 2:35 ` kaey
2021-01-26 2:42 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210124023256.TV20p6Mg1NUyG6npvHXInH27SxyDIX6y5pqXMdviU5A@z \
--to=kaey@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).