From 7b9f25b64d958e49c09b072867dbd21ef4c93ba44654baa1d53fa7c949c6379c Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Wed, 30 Sep 2020 18:22:57 +0000 Subject: [PATCH] - Update to version 0.1.13. OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/apulse?expand=0&rev=28 --- apulse-0.1.12.tar.gz | 3 --- apulse-0.1.13.tar.gz | 3 +++ apulse-alsa.patch | 22 ---------------------- apulse-fix-pulse-12.patch | 16 ---------------- apulse.changes | 11 +++++++++++ apulse.spec | 22 +++++++--------------- 6 files changed, 21 insertions(+), 56 deletions(-) delete mode 100644 apulse-0.1.12.tar.gz create mode 100644 apulse-0.1.13.tar.gz delete mode 100644 apulse-alsa.patch delete mode 100644 apulse-fix-pulse-12.patch diff --git a/apulse-0.1.12.tar.gz b/apulse-0.1.12.tar.gz deleted file mode 100644 index e9bd429..0000000 --- a/apulse-0.1.12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cfcadfe971abd785ed3ca24e576fcbaade185525c1eda76daf32dbf298e52892 -size 117220 diff --git a/apulse-0.1.13.tar.gz b/apulse-0.1.13.tar.gz new file mode 100644 index 0000000..9d6e872 --- /dev/null +++ b/apulse-0.1.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9234ec4e10e408b9c01d5f4ea768ad1fc15494217c932db2c435202a9c7b5efd +size 117369 diff --git a/apulse-alsa.patch b/apulse-alsa.patch deleted file mode 100644 index beeed95..0000000 --- a/apulse-alsa.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/apulse.h -+++ b/src/apulse.h -@@ -26,7 +26,7 @@ - - #define _GNU_SOURCE - #include "ringbuffer.h" --#include -+#include - #include - #include - #include ---- a/src/util.h -+++ b/src/util.h -@@ -24,7 +24,7 @@ - - #pragma once - --#include -+#include - #include - - int diff --git a/apulse-fix-pulse-12.patch b/apulse-fix-pulse-12.patch deleted file mode 100644 index 38ffa7d..0000000 --- a/apulse-fix-pulse-12.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/src/apulse-volume.c -+++ b/src/apulse-volume.c -@@ -282,8 +282,13 @@ pa_cvolume_scale(pa_cvolume *v, pa_volum - - APULSE_EXPORT - pa_cvolume * -+#if PA_CHECK_VERSION(11, 99, 0) -+pa_cvolume_scale_mask(pa_cvolume *v, pa_volume_t max, const pa_channel_map *cm, -+ pa_channel_position_mask_t mask) -+#else - pa_cvolume_scale_mask(pa_cvolume *v, pa_volume_t max, pa_channel_map *cm, - pa_channel_position_mask_t mask) -+#endif - { - trace_info_z("Z %s\n", __func__); - return NULL; diff --git a/apulse.changes b/apulse.changes index 4ac1836..18a46b6 100644 --- a/apulse.changes +++ b/apulse.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Sep 29 18:17:04 UTC 2020 - Alexei Sorokin + +- Update to version 0.1.13: + * Fix compiling with external PulseAudio 12.x headers. + * Link libpulse-simple.so with libpulse.so. + * Use <0 rather than !=0 for ALSA error code checking. + * Minor compilation fixes. +- Drop apulse-fix-pulse-12.patch, apulse-alsa.patch: fixed + upstream. + ------------------------------------------------------------------- Fri Nov 8 08:05:35 UTC 2019 - Stefan Seyfried diff --git a/apulse.spec b/apulse.spec index 331c77f..958e47b 100644 --- a/apulse.spec +++ b/apulse.spec @@ -1,7 +1,7 @@ # # spec file for package apulse # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,11 +17,10 @@ # integer of major pulse version -%define pulse_major %(sed -n '/^#define.*PA_MAJOR/{s/^.* //;p}' /usr/include/pulse/version.h) - +%define pulse_major %(sed -n '/^#define.*PA_MAJOR/{s/^.* //;p}' %{_includedir}/pulse/version.h) %define __provides_exclude_from ^%{_libdir}/apulse/.*.so.*$ Name: apulse -Version: 0.1.12 +Version: 0.1.13 Release: 0 Summary: PulseAudio emulation for ALSA License: MIT @@ -30,12 +29,9 @@ Source0: https://github.com/i-rinat/%{name}/archive/v%{version}.tar.gz#/% Source1: baselibs.conf Source2: %{name}.py Source3: %{name}.conf -# PATCH-FIX-OPENSUSE apulse-fix-pulse-12.patch sor.alexei@meowr.ru -- Fix PulseAudio 12+ compatibility. -Patch0: apulse-fix-pulse-12.patch -Patch1: apulse-alsa.patch %if %{pulse_major} > 12 -# PATCH-FIX-OPENSUSE apulse-fix-pulse-13.patch seife+obs@b1-systems.com -- fix pulse 13+ compatibility. -Patch2: apulse-fix-pulse-13.patch +# PATCH-FIX-OPENSUSE apulse-fix-pulse-13.patch seife+obs@b1-systems.com -- Fix PulseAudio 13+ compatibility. +Patch0: apulse-fix-pulse-13.patch %endif BuildRequires: cmake BuildRequires: gcc-c++ @@ -58,7 +54,7 @@ PulseAudio emulation intended to be used with Firefox and Skype. -DUSE_BUNDLED_PULSEAUDIO_HEADERS=OFF \ -DAPULSEPATH=%{_libdir}/%{name} \ -DCMAKE_SHARED_LINKER_FLAGS="" -LA -make %{?_smp_mflags} V=1 +%make_build %install %cmake_install @@ -71,15 +67,11 @@ install -Dpm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}.conf %postun -p /sbin/ldconfig %files -%if 0%{?suse_version} >= 1500 %license LICENSE.MIT -%else -%doc LICENSE.MIT -%endif %doc README.md %config(noreplace) %{_sysconfdir}/%{name}.conf %{_bindir}/%{name} -%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/ %{_libdir}/%{name}/libpulse*.so.* %{_mandir}/man1/apulse.1%{?ext_man}