diff options
| -rw-r--r-- | community/pulseaudio/300a1a96fa43ee456512843c671bdf1f9c75ca24.patch | 24 | ||||
| -rw-r--r-- | community/pulseaudio/APKBUILD | 170 | ||||
| -rw-r--r-- | community/pulseaudio/b89d33bb182c42db5ad3987b0e91b7bf62f421e8.patch | 45 | ||||
| -rw-r--r-- | community/pulseaudio/disable-desktop.patch | 38 |
4 files changed, 116 insertions, 161 deletions
diff --git a/community/pulseaudio/300a1a96fa43ee456512843c671bdf1f9c75ca24.patch b/community/pulseaudio/300a1a96fa43ee456512843c671bdf1f9c75ca24.patch deleted file mode 100644 index aff2f4cfc6..0000000000 --- a/community/pulseaudio/300a1a96fa43ee456512843c671bdf1f9c75ca24.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Felipe Sateler <fsateler@debian.org> -Date: Tue, 15 Jan 2019 21:52:31 -0300 -Subject: Don't compile with -ffast-math - -This flag results in calls to (at least) isfinite() and isnan() becoming -skipped, and a constant false returned. This causes test failures. -See https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/619 ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c9c414f..3165b9a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -182,7 +182,7 @@ AX_CHECK_COMPILE_FLAG([-std=gnu11], - [-pedantic -Werror]) - - AX_APPEND_COMPILE_FLAGS( -- [-Wall -W -Wextra -pipe -Wno-long-long -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -ffast-math -fno-common -fdiagnostics-show-option -fdiagnostics-color=auto], -+ [-Wall -W -Wextra -pipe -Wno-long-long -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -fno-common -fdiagnostics-show-option -fdiagnostics-color=auto], - [], [-pedantic -Werror]) - - AS_CASE([" $CFLAGS "], [*" -O0 "*], [], [ diff --git a/community/pulseaudio/APKBUILD b/community/pulseaudio/APKBUILD index bc7392e462..340195ff63 100644 --- a/community/pulseaudio/APKBUILD +++ b/community/pulseaudio/APKBUILD @@ -4,76 +4,131 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Leo <thinkabit.ukim@gmail.com> pkgname=pulseaudio -pkgver=12.2 -pkgrel=5 +pkgver=13.0 +pkgrel=0 pkgdesc="A featureful, general-purpose sound server" -url="http://www.freedesktop.org/wiki/Software/PulseAudio" +url="https://www.freedesktop.org/wiki/Software/PulseAudio/" arch="all" license="LGPL-2.1-or-later" -makedepends="m4 automake libtool intltool bash dbus-dev libcap-dev alsa-lib-dev - bluez-dev speexdsp-dev avahi-dev openssl-dev eudev-dev libsndfile-dev - gtk+3.0-dev json-c-dev fftw-dev sbc-dev jack-dev libatomic_ops-dev gettext-dev - autoconf autoconf-archive libsm-dev libice-dev xcb-util-dev libx11-dev" -subpackages="$pkgname-dev $pkgname-bluez libpulse:_libpulse - libpulse-mainloop-glib:_libpulse_mainloop_glib $pkgname-alsa $pkgname-utils - $pkgname-jack $pkgname-zeroconf $pkgname-openrc - $pkgname-bash-completion:bashcomp:noarch $pkgname-zsh-completion:zshcomp:noarch" +makedepends=" + meson + tdb-dev + alsa-lib-dev + libasyncns-dev + dbus-dev + glib-dev + gtk+3.0-dev + orc-dev + orc-compiler + libsndfile-dev + soxr-dev + libx11-dev + libxcb-dev + libice-dev + libsm-dev + libxtst-dev + avahi-dev + sbc-dev + fftw-dev + jack-dev + openssl-dev + speexdsp-dev + eudev-dev + libcap-dev + bluez-dev + check-dev + libtool + perl + perl-xml-parser + m4 + " +subpackages=" + $pkgname-dev + $pkgname-doc + $pkgname-bluez + libpulse:_libpulse + libpulse-mainloop-glib:_libpulse_mainloop_glib + $pkgname-alsa + $pkgname-utils + $pkgname-jack + $pkgname-zeroconf + $pkgname-openrc + $pkgname-bash-completion:bashcomp:noarch + $pkgname-zsh-completion:zshcomp:noarch + $pkgname-lang + $pkgname-equalizer + " install="pulseaudio.post-install" source="https://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz $pkgname.initd $pkgname.confd - disable-desktop.patch - b89d33bb182c42db5ad3987b0e91b7bf62f421e8.patch - 300a1a96fa43ee456512843c671bdf1f9c75ca24.patch" - - -prepare() { - default_prepare - autopoint --force - AUTOPOINT='intltoolize --automake --copy --force' autoreconf -if -} + " build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + export CFLAGS="$CFLAGS -lintl" + meson \ --prefix=/usr \ --sysconfdir=/etc \ - --mandir=/usr/share/man \ --localstatedir=/var \ - --datadir=/usr/share \ - --enable-bluez5 \ - --disable-bluez4 \ - --disable-nls \ - --disable-orc \ - --disable-gconf \ - --disable-oss-output \ - --disable-oss-wrapper \ - --disable-tcpwrapper \ - --disable-systemd-daemon \ - --disable-systemd-journal \ - --with-udev-rules-dir=/usr/lib/udev/rules.d \ - --disable-rpath \ - --disable-esound \ - --disable-hal-compat \ - --enable-x11 \ - --enable-avahi - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - sed -i -e 's/SUBDIRS = src doxygen man po/SUBDIRS = src doxygen/g' Makefile - - make + --optimization=s \ + --buildtype=release \ + -Dgcov=false \ + -Dman=true \ + -Dtests=true \ + -Dsystem_user=pulse \ + -Dsystem_group=pulse \ + -Ddatabase=tdb \ + -Dalsa=enabled \ + -Dasyncns=enabled \ + -Davahi=enabled \ + -Dbluez5=true \ + -Ddbus=enabled \ + -Dfftw=enabled \ + -Dglib=enabled \ + -Dgsettings=enabled \ + -Dgtk=enabled \ + -Dhal-compat=false \ + -Dipv6=true \ + -Djack=enabled \ + -Dlirc=disabled \ + -Dopenssl=enabled \ + -Dorc=enabled \ + -Dsamplerate=disabled \ + -Dsoxr=enabled \ + -Dspeex=enabled \ + -Dsystemd=disabled \ + -Dudev=enabled \ + -Dx11=enabled \ + -Dudevrulesdir=/usr/lib/udev/rules.d \ + . output + ninja -C output } check() { - make check + ninja -C output test } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C output install install -Dm644 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname + + # Assumes that any volume adjustment is intended by the user, who can control + # each app's volume. Misbehaving clients can trigger earsplitting volume + # jumps. App volumes can diverge wildly and cause apps without their own + # volume control to fall below sink volume; a sink-only volume control will + # suddenly be unable to make such an app loud enough. + sed -e '/flat-volumes/iflat-volumes = no' -i "$pkgdir"/etc/pulse/daemon.conf + + # Disable cork-request module, can result in e.g. media players unpausing + # when there's a Skype call incoming + sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ + -i "$pkgdir"/usr/bin/start-pulseaudio-x11 + + # Required by qpaeq + sed -e '/Load several protocols/aload-module module-dbus-protocol' \ + -i "$pkgdir"/etc/pulse/default.pa } openrc() { @@ -157,9 +212,16 @@ zshcomp() { mv "$pkgdir"/usr/share/zsh "$subpkgdir"/usr/share } -sha512sums="877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e pulseaudio-12.2.tar.xz +equalizer() { + pkgdesc="Equalizer for $pkgname" + depends="pulseuadio=$pkgver-r$pkgrel py3-qt5 py3-sip py3-dbus" + mkdir -p "$subpkgdir"/usr/lib/pulse-$pkgver/modules "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/lib/pulse-$pkgver/modules/module-equalizer-sink.so \ + "$subpkgdir"/usr/lib/pulse-$pkgver/modules/ + mv "$pkgdir"/usr/bin/qpaeq \ + "$subpkgdir"/usr/bin/ +} + +sha512sums="d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c pulseaudio-13.0.tar.xz 34fe54ece5df60ce63a7955cd828a2716670fef71f40960698ae5518fdaf9cd599f4d8f8852e2c88d715600a9ad06a38984415e5eb320071012e5eb6e5c1b8b1 pulseaudio.initd -75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd -11aaa7a1f015ae2b99c2a74f1d2646b51df4a2243c0d44795abbfb9892b9c34ceb37902f0eefa206790d375bd3945cfefaa381e00f4e846cd325b9344328282b disable-desktop.patch -bd5f34363076b655070add1e1f6fa526766e69c9ba75d7e6aad7e13782ecbd183a0837aa5fc20679c54d3939871497f0c63d3d6dd8a985105263b62dd0aaa3c7 b89d33bb182c42db5ad3987b0e91b7bf62f421e8.patch -fe1f4c4b112b2e756c0cd56dd7990865165e8cfc92a9cd3e14a8e4ac4c359f3d501a24a44fd8bd26258b49ca52cfdd84581ad7509274fbd79a211b60dd9faf7f 300a1a96fa43ee456512843c671bdf1f9c75ca24.patch" +75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd" diff --git a/community/pulseaudio/b89d33bb182c42db5ad3987b0e91b7bf62f421e8.patch b/community/pulseaudio/b89d33bb182c42db5ad3987b0e91b7bf62f421e8.patch deleted file mode 100644 index 671ef3cc83..0000000000 --- a/community/pulseaudio/b89d33bb182c42db5ad3987b0e91b7bf62f421e8.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b89d33bb182c42db5ad3987b0e91b7bf62f421e8 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -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 <tiwai@suse.de> ---- - 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 ---- a/configure.ac -+++ b/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 ---- a/src/modules/alsa/alsa-ucm.h -+++ b/src/modules/alsa/alsa-ucm.h -@@ -23,7 +23,7 @@ - ***/ - - #ifdef HAVE_ALSA_UCM --#include <use-case.h> -+#include <alsa/use-case.h> - #else - typedef void snd_use_case_mgr_t; - #endif --- -2.18.1 - diff --git a/community/pulseaudio/disable-desktop.patch b/community/pulseaudio/disable-desktop.patch deleted file mode 100644 index 45f3493f5b..0000000000 --- a/community/pulseaudio/disable-desktop.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fixes build failure - -diff --git a/src/Makefile.am b/src/Makefile.am -index f4464d2..acd2381 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -105,7 +105,6 @@ EXTRA_DIST = \ - daemon/systemd/user/pulseaudio.socket \ - utils/padsp.in \ - utils/qpaeq \ -- daemon/pulseaudio.desktop.in \ - map-file \ - daemon/pulseaudio-system.conf \ - modules/echo-cancel/adrian-license.txt \ -@@ -123,14 +122,6 @@ dbuspolicy_DATA = \ - daemon/pulseaudio-system.conf - endif - --if HAVE_X11 --xdgautostart_in_files = \ -- daemon/pulseaudio.desktop.in --xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop) --@INTLTOOL_DESKTOP_RULE@ --endif -- -- - ################################### - # Includes # - ################################### -@@ -2189,7 +2180,6 @@ module_allow_passthrough_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_allow_ - # Some minor stuff # - ################################### - --CLEANFILES += daemon/pulseaudio.desktop - DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 pulseaudio.service - - if OS_IS_WIN32 - |