$ git diff --patch-with-stat --summary dc00180bc270d31fe28b5ec2a06cafdba2befed4..95b667bbe61bcdbdace8b7453822edb967e2d0f8
.abf.yml | 2 +-
FAudio.spec | 107 ++++++++++++++++++++++++++++++++++++++++--------------------
2 files changed, 72 insertions(+), 37 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index ba80994..146b3ad 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- 19.12.tar.gz: ec9c337d60bee494776f6a39f09fe389ec1d3f33
+ 20.09.tar.gz: 11c34c1edb869bd3fda9ae71d1936d5c736446ce
diff --git a/FAudio.spec b/FAudio.spec
index fe39845..ccef770 100644
--- a/FAudio.spec
+++ b/FAudio.spec
@@ -1,10 +1,17 @@
+# Wine uses FAudio
+%ifarch %{x86_64}
+%bcond_without compat32
+%endif
+
%define major 0
%define libname %mklibname %{name} %{major}
%define devname %mklibname %{name} -d
+%define lib32name %mklib32name %{name} %{major}
+%define dev32name %mklib32name %{name} -d
Summary: A free reimplementation of the DirectX XAudio APIs
Name: FAudio
-Version: 19.12
+Version: 20.09
Release: 1
License: MIT
Group: System/Libraries
@@ -13,40 +20,15 @@ Source0: https://github.com/FNA-XNA/FAudio/archive/%{version}.tar.gz
Patch0: faudio-19.03-compile.patch
BuildRequires: cmake ninja
BuildRequires: pkgconfig(libavcodec)
-BuildRequires: pkgconfig(libavutil)
-BuildRequires: pkgconfig(libswresample)
-BuildRequires: pkgconfig(sdl2)
-BuildRequires: pkgconfig(vpx)
-BuildRequires: pkgconfig(libwebpmux)
-BuildRequires: pkgconfig(libwebp)
-BuildRequires: pkgconfig(liblzma)
-BuildRequires: pkgconfig(celt)
-BuildRequires: pkgconfig(zvbi-0.2)
-BuildRequires: pkgconfig(zlib)
-BuildRequires: gsm-devel
-BuildRequires: pkgconfig(libilbc)
-BuildRequires: pkgconfig(libopenjp2)
-BuildRequires: pkgconfig(speex)
-BuildRequires: pkgconfig(theoradec)
-BuildRequires: pkgconfig(theoraenc)
-BuildRequires: pkgconfig(twolame)
-BuildRequires: pkgconfig(vorbis)
-BuildRequires: pkgconfig(vorbisenc)
-BuildRequires: pkgconfig(wavpack)
-BuildRequires: pkgconfig(xavs)
-BuildRequires: pkgconfig(libva)
-BuildRequires: pkgconfig(libva-drm)
-BuildRequires: pkgconfig(libdrm)
-BuildRequires: pkgconfig(vdpau)
-BuildRequires: pkgconfig(x11)
-BuildRequires: pkgconfig(soxr)
-BuildRequires: pkgconfig(libpng)
-BuildRequires: pkgconfig(ogg)
-BuildRequires: pkgconfig(xext)
-BuildRequires: pkgconfig(xcb)
-BuildRequires: pkgconfig(xau)
-BuildRequires: pkgconfig(xdmcp)
BuildRequires: pkgconfig(dbus-1)
+BuildRequires: pkgconfig(sdl2)
+BuildRequires: pkgconfig(libunwind-llvm)
+%if %{with compat32}
+BuildRequires: devel(libavcodec)
+BuildRequires: devel(libdbus-1)
+BuildRequires: devel(libSDL2-2.0)
+BuildRequires: devel(libunwind)
+%endif
#----------------------------------------------------------------------------
@@ -91,19 +73,72 @@ XAudio2, X3DAudio, XAPO, and XACT3.
%{_libdir}/libFAudio.so
%{_libdir}/cmake/FAudio
+#----------------------------------------------------------------------------
+%if %{with compat32}
+%package -n %{lib32name}
+Summary: Main library for %{name} (32-bit)
+Group: System/Libraries
+
+%description -n %{lib32name}
+This package contains the library needed to run programs dynamically
+linked with %{name}.
+
+FAudio is an XAudio reimplementation that focuses solely on developing
+fully accurate DirectX Audio runtime libraries for the FNA project, including
+XAudio2, X3DAudio, XAPO, and XACT3.
+
+%files -n %{lib32name}
+%{_prefix}/lib/libFAudio.so.%{major}*
+
#----------------------------------------------------------------------------
+%package -n %{dev32name}
+Summary: Headers for developing programs that will use %{name} (32-bit)
+Group: Development/C
+Requires: %{devname} = %{version}-%{release}
+Requires: %{lib32name} = %{version}-%{release}
+
+%description -n %{dev32name}
+This package contains the headers that programmers will need to develop
+applications which will use %{name}.
+
+FAudio is an XAudio reimplementation that focuses solely on developing
+fully accurate DirectX Audio runtime libraries for the FNA project, including
+XAudio2, X3DAudio, XAPO, and XACT3.
+
+%files -n %{dev32name}
+%{_prefix}/lib/libFAudio.so
+%{_prefix}/lib/cmake/FAudio
+%endif
+
%prep
%autosetup -p1
-%build
+%if %{with compat32}
+%cmake32 \
+ -DBUILD_TESTS:BOOL=ON \
+ -DBUILD_UTILS:BOOL=ON \
+ -DFFMPEG:BOOL=ON \
+ -DXNASONG:BOOL=ON \
+ -G Ninja
+cd ..
+%endif
+
%cmake \
-DBUILD_TESTS:BOOL=ON \
-DBUILD_UTILS:BOOL=ON \
-DFFMPEG:BOOL=ON \
-DXNASONG:BOOL=ON \
-G Ninja
-%ninja_build
+
+%build
+%if %{with compat32}
+%ninja_build -C build32
+%endif
+%ninja_build -C build
%install
+%if %{with compat32}
+%ninja_install -C build32
+%endif
%ninja_install -C build