Hello community, here is the log from the commit of package apulse for openSUSE:Factory checked in at 2018-06-19 12:04:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apulse (Old) and /work/SRC/openSUSE:Factory/.apulse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apulse" Tue Jun 19 12:04:25 2018 rev:10 rq:617321 version:0.1.12 Changes: -------- --- /work/SRC/openSUSE:Factory/apulse/apulse.changes 2018-03-19 23:37:50.438516899 +0100 +++ /work/SRC/openSUSE:Factory/.apulse.new/apulse.changes 2018-06-19 12:04:26.488298912 +0200 @@ -1,0 +2,21 @@ +Sat Jun 16 15:48:41 UTC 2018 - [email protected] + +- Update to version 0.1.12 (changes since 0.1.10): + * Implement new, free, and write functions of the pa_simple_* + family. + * Add some documentation about issues related to sandboxing. + * Drop the libpulsecommon-5.0.so binary. + * Add stub functions for the mainloop-glib interface. + * add a man- page. + * Cosmetic code changes. + * Misc compatibility fixes. +- Add apulse-fix-pulse-12.patch [email protected]: Fix + PulseAudio 12+ compatibility. +- Remove apulse-link-math.patch. +- Use %cmake_install. +- Rewrite the apulse script in Python 3 to avoid insecure config + reading from home. The apulse.conf format was changed, and the + user config also was moved from ~/.apulse.conf to + $XDG_CONFIG_HOME/apulse.conf. + +------------------------------------------------------------------- Old: ---- apulse apulse-0.1.10.tar.gz apulse-link-math.patch New: ---- apulse-0.1.12.tar.gz apulse-fix-pulse-12.patch apulse.py ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apulse.spec ++++++ --- /var/tmp/diff_new_pack.y9TQP4/_old 2018-06-19 12:04:27.292269062 +0200 +++ /var/tmp/diff_new_pack.y9TQP4/_new 2018-06-19 12:04:27.300268765 +0200 @@ -12,12 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define __provides_exclude_from ^%{_libdir}/apulse/.*.so.*$ Name: apulse -Version: 0.1.10 +Version: 0.1.12 Release: 0 Summary: PulseAudio emulation for ALSA License: MIT @@ -25,10 +26,10 @@ URL: https://github.com/i-rinat/apulse Source0: https://github.com/i-rinat/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: baselibs.conf -Source2: %{name}.conf -Source3: %{name} -# PATCH-FIX-OPENSUSE apulse-link-math.patch [email protected] -- Link with -lm to fix building. -Patch0: apulse-link-math.patch +Source2: %{name}.py +Source3: %{name}.conf +# PATCH-FIX-OPENSUSE apulse-fix-pulse-12.patch [email protected] -- Fix PulseAudio 12+ compatibility. +Patch0: apulse-fix-pulse-12.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -40,34 +41,40 @@ %endif %description -PulseAudio emulation intended to be used with Skype and Firefox +PulseAudio emulation intended to be used with Firefox and Skype. %prep %setup -q %patch0 -p1 %build -%cmake -LA -DUSE_BUNDLED_PULSEAUDIO_HEADERS=OFF -DAPULSEPATH=%{_libdir}/%{name} -make %{?_smp_mflags} +%cmake \ + -DUSE_BUNDLED_PULSEAUDIO_HEADERS=OFF \ + -DAPULSEPATH=%{_libdir}/%{name} \ + -DCMAKE_SHARED_LINKER_FLAGS="" -LA +make %{?_smp_mflags} V=1 %install -mkdir -p %{buildroot}%{_libdir}/%{name} -install -m644 build/libpulse*.so.* %{buildroot}%{_libdir}/%{name} -mkdir %{buildroot}%{_sysconfdir} -install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir} -mkdir %{buildroot}%{_bindir} -install %{SOURCE3} %{buildroot}%{_bindir} +%cmake_install +rm %{buildroot}%{_libdir}/%{name}/libpulse*.so +install -Dpm 0755 %{SOURCE2} %{buildroot}%{_bindir}/%{name} +install -Dpm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}.conf %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig %files -%defattr(0644,root,root,-) +%if 0%{?suse_version} >= 1500 %license LICENSE.MIT +%else +%doc LICENSE.MIT +%endif %doc README.md %config(noreplace) %{_sysconfdir}/%{name}.conf -%attr(0755,root,root) %{_bindir}/%{name} +%{_bindir}/%{name} %dir %{_libdir}/%{name} %{_libdir}/%{name}/libpulse*.so.* +%{_mandir}/man1/apulse.1%{?ext_man} %changelog ++++++ apulse-0.1.10.tar.gz -> apulse-0.1.12.tar.gz ++++++ ++++ 7948 lines of diff (skipped) ++++++ apulse-fix-pulse-12.patch ++++++ --- 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; ++++++ apulse.conf ++++++ --- /var/tmp/diff_new_pack.y9TQP4/_old 2018-06-19 12:04:27.456262973 +0200 +++ /var/tmp/diff_new_pack.y9TQP4/_new 2018-06-19 12:04:27.460262825 +0200 @@ -1,2 +1,6 @@ -APULSE_CAPTURE_DEVICE=${APULSE_CAPTURE_DEVICE:='plughw:0,0'}; -APULSE_PLAYBACK_DEVICE=${APULSE_PLAYBACK_DEVICE:='default'}; +# This file is part of the apulse package. +# +# User-specific configuration can go to ~/.config/apulse.conf + +; playback-device = default +capture-device = plughw:0,0 ++++++ apulse.py ++++++ #!/usr/bin/python3 import configparser import itertools import os import sys xdg_config_home = os.environ.get("XDG_CONFIG_HOME", os.path.expanduser("~/.config")) proc_env = os.environ conf_parser = configparser.SafeConfigParser() for conf_file in ("/etc/apulse.conf", os.path.join(xdg_config_home, "apulse.conf")): if os.access(conf_file, os.R_OK): with open(conf_file, "r") as conf: conf = itertools.chain(("[0]",), conf) conf_parser.read_file(conf) playback_device = conf_parser.get("0", "playback-device", fallback="default") capture_device = conf_parser.get("0", "capture-device", fallback="default") if "APULSE_PLAYBACK_DEVICE" not in proc_env: proc_env["APULSE_PLAYBACK_DEVICE"] = playback_device if "APULSE_CAPTURE_DEVICE" not in proc_env: proc_env["APULSE_CAPTURE_DEVICE"] = capture_device ld_libpath = os.environ.get("LD_LIBRARY_PATH", "") proc_env["LD_LIBRARY_PATH"] = "/usr/$LIB/apulse" + \ (":" if ld_libpath else "") + ld_libpath os.execvpe(sys.argv[1], sys.argv[1:], proc_env)
