From 60c1cf8cdb7017260267a6103ea893926db8086b Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Tue, 17 Sep 2019 00:00:04 +0200 Subject: [PATCH 1/2] pulseaudio: update to 13.0. --- common/shlibs | 4 +- .../pulseaudio/patches/fix-alsa-module.patch | 42 ------------------- srcpkgs/pulseaudio/template | 23 ++++------ 3 files changed, 11 insertions(+), 58 deletions(-) delete mode 100644 srcpkgs/pulseaudio/patches/fix-alsa-module.patch diff --git a/common/shlibs b/common/shlibs index d15941dce29..33753136b75 100644 --- a/common/shlibs +++ b/common/shlibs @@ -760,8 +760,8 @@ libasyncns.so.0 libasyncns-0.8_1 libpulse.so.0 libpulseaudio-1.0_1 libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1 libpulse-simple.so.0 libpulseaudio-1.0_1 -libpulsecommon-12.2.so libpulseaudio-12.2_1 -libpulsecore-12.2.so libpulseaudio-12.2_1 +libpulsecommon-13.0.so libpulseaudio-13.0_1 +libpulsecore-13.0.so libpulseaudio-13.0_1 liborc-0.4.so.0 orc-0.4.11_1 liborc-test-0.4.so.0 orc-0.4.11_1 libgmime-2.6.so.0 gmime-2.6.4_1 diff --git a/srcpkgs/pulseaudio/patches/fix-alsa-module.patch b/srcpkgs/pulseaudio/patches/fix-alsa-module.patch deleted file mode 100644 index ddc4236ee8f..00000000000 --- a/srcpkgs/pulseaudio/patches/fix-alsa-module.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b89d33bb182c42db5ad3987b0e91b7bf62f421e8 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Sun, 21 Apr 2019 11:59:30 +0200 -Subject: [PATCH] alsa: Fix inclusion of use-case.h - -The recent change in ALSA upstream stripped -I$include/alsa path from -pkgconfig. We already fixed for this change in some places but still -the code for UCM was overlooked, and this resulted in the unresolved -symbols in alsa card module. Fix them as well. - -Signed-off-by: Takashi Iwai ---- - configure.ac | 2 +- - src/modules/alsa/alsa-ucm.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c004bd70d..b44ed1595 100644 ---- configure.ac -+++ configure.ac -@@ -826,7 +826,7 @@ AS_IF([test "x$enable_alsa" = "xyes" && test "x$HAVE_ALSA" = "x0"], - AS_IF([test "x$HAVE_ALSA" = "x1"], - [ - save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $ASOUNDLIB_CFLAGS" -- AC_CHECK_HEADERS([use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0) -+ AC_CHECK_HEADERS([alsa/use-case.h], HAVE_ALSA_UCM=1, HAVE_ALSA_UCM=0) - CPPFLAGS="$save_CPPFLAGS" - ], - HAVE_ALSA_UCM=0) -diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h -index 53abf3f90..c926f3cc3 100644 ---- src/modules/alsa/alsa-ucm.h -+++ src/modules/alsa/alsa-ucm.h -@@ -23,7 +23,7 @@ - ***/ - - #ifdef HAVE_ALSA_UCM --#include -+#include - #else - typedef void snd_use_case_mgr_t; - #endif diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index 208c5317e9a..6dbebc9694f 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,22 +1,21 @@ # Template file for 'pulseaudio' pkgname=pulseaudio -version=12.2 -revision=6 +version=13.0 +revision=1 build_style=gnu-configure configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc - --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d --disable-bluez4 - --disable-esound --disable-gtk3 --enable-bluez5 --disable-bluez5-ofono-headset - --disable-systemd-login --disable-systemd-daemon --disable-systemd-journal - --enable-webrtc-aec --with-bash-completion-dir=/usr/share/bash-completion/completions + --with-database=tdb --with-udev-rules-dir=/usr/lib/udev/rules.d --disable-esound + --disable-gtk3 --enable-bluez5 --disable-bluez5-ofono-headset --disable-systemd-login + --disable-systemd-daemon --disable-systemd-journal --enable-webrtc-aec + --with-bash-completion-dir=/usr/share/bash-completion/completions --enable-bluez5-native-headset" -hostmakedepends="automake autoconf gettext-devel glib-devel intltool libtool - orc-devel pkg-config" +hostmakedepends="automake gettext-devel libtool orc-devel perl-XML-Parser pkg-config" makedepends="avahi-libs-devel eudev-libudev-devel fftw-devel jack-devel libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel -webrtc-audio-processing-devel xcb-util-devel" + webrtc-audio-processing-devel xcb-util-devel" depends="rtkit" conf_files="/etc/pulse/*" short_desc="Featureful, general-purpose sound server" @@ -24,7 +23,7 @@ maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://www.freedesktop.org/wiki/Software/PulseAudio" distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz" -checksum=809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055 +checksum=961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057 system_groups="pulse-access" system_accounts="pulse" pulse_groups="audio" @@ -39,10 +38,6 @@ case "$XBPS_TARGET_MACHINE" in arm*) configure_args+=" --disable-neon-opt" ;; esac -pre_configure() { - NOCONFIGURE=1 ./bootstrap.sh -} - post_install() { rm -f ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf vsv pulseaudio From 7bd32ec483a6b288d75724baabdbaa2849e91d39 Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Tue, 17 Sep 2019 15:05:02 +0200 Subject: [PATCH 2/2] pulseaudio-module-sndio: rebuild for pulseaudio-13.0 --- srcpkgs/pulseaudio-module-sndio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pulseaudio-module-sndio/template b/srcpkgs/pulseaudio-module-sndio/template index dabc88743d8..5fab8ef971d 100644 --- a/srcpkgs/pulseaudio-module-sndio/template +++ b/srcpkgs/pulseaudio-module-sndio/template @@ -1,7 +1,7 @@ # Template file for 'pulseaudio-module-sndio' pkgname=pulseaudio-module-sndio version=12.0 -revision=4 +revision=5 build_style=gnu-makefile make_use_env=yes hostmakedepends="pulseaudio pkg-config"