aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-11-24 02:35:27 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-11-24 11:43:49 +0000
commit2f6c312e8e52c0c73820cd49c95b6e248987d821 (patch)
tree38d0e64b6776bfc50ec43752beb8aa1ecb6e7c68
parenta7553438b55b59caa792443a757643b1f39b1c47 (diff)
downloadaports-2f6c312e8e52c0c73820cd49c95b6e248987d821.tar.gz
aports-2f6c312e8e52c0c73820cd49c95b6e248987d821.tar.bz2
aports-2f6c312e8e52c0c73820cd49c95b6e248987d821.tar.xz
community/pulseaudio: upgrade to 14.0
-rw-r--r--community/pulseaudio/APKBUILD22
-rw-r--r--community/pulseaudio/define-tunnel_sink-for-module-tunnel-sink.patch28
-rw-r--r--community/pulseaudio/link-libintl.patch117
-rw-r--r--community/pulseaudio/python3.patch12
4 files changed, 18 insertions, 161 deletions
diff --git a/community/pulseaudio/APKBUILD b/community/pulseaudio/APKBUILD
index bb3eb455b1..778f8ca0e7 100644
--- a/community/pulseaudio/APKBUILD
+++ b/community/pulseaudio/APKBUILD
@@ -5,9 +5,9 @@
# Contributor: Antoine Fontaine <antoine.fontaine@epfl.ch>
# Maintainer: Leo <thinkabit.ukim@gmail.com>
pkgname=pulseaudio
-pkgver=13.0
-pkgrel=10
-pkgdesc="A featureful, general-purpose sound server"
+pkgver=14.0
+pkgrel=0
+pkgdesc="featureful, general-purpose sound server"
url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
arch="all"
license="LGPL-2.1-or-later"
@@ -63,10 +63,8 @@ subpackages="
install="pulseaudio.post-install"
source="https://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz
link-libintl.patch
- python3.patch
$pkgname.initd
$pkgname.confd
- define-tunnel_sink-for-module-tunnel-sink.patch
"
case "$CARCH" in
@@ -79,6 +77,9 @@ case "$CARCH" in
esac
build() {
+ # -Dgstreamer=disabled because the GStreamer RTP protocol implementation is
+ # cosnidered experimental by upstream.
+ # See: https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/14.0/
abuild-meson \
-Dgcov=false \
-Dman=true \
@@ -108,6 +109,7 @@ build() {
-Dudev=enabled \
-Dx11=enabled \
-Dudevrulesdir=/usr/lib/udev/rules.d \
+ -Dgstreamer=disabled \
. output
meson compile ${JOBS:+-j ${JOBS}} -C output
}
@@ -224,7 +226,7 @@ zshcomp() {
equalizer() {
pkgdesc="Equalizer for $pkgname"
- depends="pulseaudio=$pkgver-r$pkgrel py3-qt5 py3-sip py3-dbus"
+ depends="pulseaudio=$pkgver-r$pkgrel py3-qt5 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/
@@ -232,9 +234,7 @@ equalizer() {
"$subpkgdir"/usr/bin/
}
-sha512sums="d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c pulseaudio-13.0.tar.xz
-126b66e8fd3e0b231beed987acf0f1aecb8a9da1c4d4591eb65a5d8d3e0561bd6b3652e2c3dc079350be4219df48a446a58c4539f7275edba941db846837baae link-libintl.patch
-f45f4c9ddc75ff6a3ef42cc916bc11615b74fa1214502455d13a05c90acd3dcab652681bab1f768f7f02a863226a717bd63585c3405a9f58db40470b293d61d3 python3.patch
+sha512sums="0c89806c00d2719cb981b2f8883bedd9bf63b16f0347d8591b8b33cc1f8c1d7864d4bcc80016308d1cede5eff2c7d5eb90a340c004047235463c7a6d1c6ec65f pulseaudio-14.0.tar.xz
+2c31c5bc592e748248215f8f62f85687cfec230b05f65441e6dafa5fa77d4967e97636209b2011a4501ed1337ecd880b264baa175586fc85183a980846cb8146 link-libintl.patch
34fe54ece5df60ce63a7955cd828a2716670fef71f40960698ae5518fdaf9cd599f4d8f8852e2c88d715600a9ad06a38984415e5eb320071012e5eb6e5c1b8b1 pulseaudio.initd
-75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd
-0493b75e0dcfa4a48c68a394c8a0aa4fc395803e572eff90ac3234da8e87da4b8f5dc2d3ed68322d4565364e7c12fc9eeea07aff9dc9a46d587135302bba92bd define-tunnel_sink-for-module-tunnel-sink.patch"
+75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd"
diff --git a/community/pulseaudio/define-tunnel_sink-for-module-tunnel-sink.patch b/community/pulseaudio/define-tunnel_sink-for-module-tunnel-sink.patch
deleted file mode 100644
index a0926c4b3b..0000000000
--- a/community/pulseaudio/define-tunnel_sink-for-module-tunnel-sink.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7e039c4ff7466d253ac8a9511ffbe02b9ffc721c Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Sun, 15 Sep 2019 13:47:19 +0200
-Subject: [PATCH] meson: Define TUNNEL_SINK for module-tunnel-sink
-
-This was missing, so it was building another tunnel-source instead.
-
-Fixes https://bugs.archlinux.org/task/63755
----
- src/modules/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/meson.build b/src/modules/meson.build
-index 92d5871f9..dd2241f42 100644
---- a/src/modules/meson.build
-+++ b/src/modules/meson.build
-@@ -55,7 +55,7 @@ all_modules = [
- [ 'module-suspend-on-idle', 'module-suspend-on-idle.c' ],
- [ 'module-switch-on-connect', 'module-switch-on-connect.c' ],
- [ 'module-switch-on-port-available', 'module-switch-on-port-available.c' ],
-- [ 'module-tunnel-sink', 'module-tunnel.c', [], [], [x11_dep] ],
-+ [ 'module-tunnel-sink', 'module-tunnel.c', [], ['-DTUNNEL_SINK=1'], [x11_dep] ],
- [ 'module-tunnel-sink-new', 'module-tunnel-sink-new.c' ],
- [ 'module-tunnel-source', 'module-tunnel.c', [], [], [x11_dep] ],
- [ 'module-tunnel-source-new', 'module-tunnel-source-new.c' ],
---
-2.24.1
-
diff --git a/community/pulseaudio/link-libintl.patch b/community/pulseaudio/link-libintl.patch
index 95b58ec9fd..7dbbb3ecd4 100644
--- a/community/pulseaudio/link-libintl.patch
+++ b/community/pulseaudio/link-libintl.patch
@@ -1,9 +1,9 @@
diff --git a/meson.build b/meson.build
-index a10a1b3c8..c4cf8c6a9 100644
+index 658eeee..349752e 100644
--- a/meson.build
+++ b/meson.build
-@@ -296,6 +296,12 @@ if cc.has_function('SYS_memfd_create', prefix : '#include <sys/syscall.h>')
- cdata.set('HAVE_MEMFD', 1)
+@@ -307,6 +307,12 @@ else
+ libintl_dep = cc.find_library('intl')
endif
+if cc.has_function('libintl_dgettext')
@@ -15,119 +15,16 @@ index a10a1b3c8..c4cf8c6a9 100644
# Symbols
if cc.has_header_symbol('signal.h', 'SIGXCPU')
-diff --git a/src/daemon/meson.build b/src/daemon/meson.build
-index 9bc3bf18e..9c9f807e7 100644
---- a/src/daemon/meson.build
-+++ b/src/daemon/meson.build
-@@ -31,7 +31,7 @@ executable('pulseaudio',
- include_directories : [configinc, topinc],
- link_args : ['-ffast-math'],
- link_with : [libpulsecore, libpulsecommon, libpulse],
-- dependencies : [ltdl_dep, cap_dep, dbus_dep, libsystemd_dep, dl_dep],
-+ dependencies : [ltdl_dep, cap_dep, dbus_dep, libsystemd_dep, dl_dep, libintl_dep],
- c_args : pa_c_args,
- )
-
-diff --git a/src/meson.build b/src/meson.build
-index c9b71a484..832c0de0d 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -183,7 +183,7 @@ libpulsecommon = shared_library('pulsecommon-' + pa_version_major_minor,
- install_dir : privlibdir,
- dependencies : [
- libm_dep, thread_dep, dl_dep, shm_dep, iconv_dep, sndfile_dep, dbus_dep,
-- x11_dep, libsystemd_dep, glib_dep, gtk_dep, asyncns_dep
-+ x11_dep, libsystemd_dep, glib_dep, gtk_dep, asyncns_dep, libintl_dep,
- ],
- implicit_include_directories : false)
-
diff --git a/src/pulse/meson.build b/src/pulse/meson.build
-index 00c686772..2a6f78489 100644
+index aaebff5..3f68ac3 100644
--- a/src/pulse/meson.build
+++ b/src/pulse/meson.build
-@@ -81,10 +81,10 @@ libpulse = shared_library('pulse',
- link_args : [nodelete_link_args, versioning_link_args],
- install : true,
- install_rpath : privlibdir,
-- dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep],
-+ dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep, libintl_dep],
+@@ -84,7 +84,7 @@ libpulse = shared_library('pulse',
+ dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep, libintl_dep],
implicit_include_directories : false)
-libpulse_dep = declare_dependency(link_with: libpulse)
+libpulse_dep = declare_dependency(link_with: libpulse, dependencies: libintl_dep)
- install_data(
+ install_headers(
libpulse_headers, 'simple.h',
-diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build
-index 19f6b9e99..0bd596cbd 100644
---- a/src/pulsecore/meson.build
-+++ b/src/pulsecore/meson.build
-@@ -198,7 +198,7 @@ libpulsecore = shared_library('pulsecore-' + pa_version_major_minor,
- install_rpath : privlibdir,
- install_dir : privlibdir,
- link_with : libpulsecore_simd_lib,
-- dependencies : [libm_dep, libpulsecommon_dep, libpulse_dep, ltdl_dep, shm_dep, sndfile_dep, database_dep, dbus_dep, libatomic_ops_dep, orc_dep, samplerate_dep, soxr_dep, speex_dep, x11_dep],
-+ dependencies : [libm_dep, libpulsecommon_dep, libpulse_dep, ltdl_dep, shm_dep, sndfile_dep, database_dep, dbus_dep, libatomic_ops_dep, orc_dep, samplerate_dep, soxr_dep, speex_dep, x11_dep, libintl_dep],
- implicit_include_directories : false)
-
- libpulsecore_dep = declare_dependency(link_with: libpulsecore)
-diff --git a/src/tests/meson.build b/src/tests/meson.build
-index 621c2c965..a03d73cdb 100644
---- a/src/tests/meson.build
-+++ b/src/tests/meson.build
-@@ -53,7 +53,7 @@ default_tests = [
- [ 'queue-test', 'queue-test.c',
- [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
- [ 'resampler-test', 'resampler-test.c',
-- [ libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
-+ [ libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libintl_dep ] ],
- [ 'rtpoll-test', 'rtpoll-test.c',
- [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ],
- [ 'smoother-test', 'smoother-test.c',
-diff --git a/src/utils/meson.build b/src/utils/meson.build
-index d00e030ae..dedf4e404 100644
---- a/src/utils/meson.build
-+++ b/src/utils/meson.build
-@@ -15,7 +15,7 @@ executable('pacat',
- install_rpath : privlibdir,
- include_directories : [configinc, topinc],
- link_with : [libpulsecommon, libpulse],
-- dependencies : [sndfile_dep],
-+ dependencies : [sndfile_dep, libintl_dep],
- c_args : pa_c_args,
- )
-
-@@ -36,7 +36,7 @@ executable('pactl',
- install_rpath : privlibdir,
- include_directories : [configinc, topinc],
- link_with : [libpulsecommon, libpulse],
-- dependencies : [sndfile_dep],
-+ dependencies : [sndfile_dep, libintl_dep],
- c_args : pa_c_args,
- )
-
-@@ -50,6 +50,7 @@ executable('pasuspender',
- install_rpath : privlibdir,
- include_directories : [configinc, topinc],
- link_with : [libpulsecommon, libpulse],
-+ dependencies: [libintl_dep],
- c_args : pa_c_args,
- )
-
-@@ -63,6 +64,7 @@ executable('pacmd',
- install_rpath : privlibdir,
- include_directories : [configinc, topinc],
- link_with : [libpulsecommon, libpulse],
-+ dependencies: [libintl_dep],
- c_args : pa_c_args,
- )
-
-@@ -77,7 +79,7 @@ if x11_dep.found()
- install_rpath : privlibdir,
- include_directories : [configinc, topinc],
- link_with : [libpulsecommon, libpulse],
-- dependencies : [x11_dep],
-+ dependencies : [x11_dep, libintl_dep],
- c_args : pa_c_args,
- )
- endif
diff --git a/community/pulseaudio/python3.patch b/community/pulseaudio/python3.patch
deleted file mode 100644
index 1afe4306bc..0000000000
--- a/community/pulseaudio/python3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Use python3 in the qt5 GUI for th pulseaudio equalizer
-
-diff --git a/src/utils/qpaeq b/src/utils/qpaeq
-index ac0daec..dd53a32 100755
---- a/src/utils/qpaeq
-+++ b/src/utils/qpaeq
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # qpaeq is a equalizer interface for pulseaudio's equalizer sinks
- # Copyright (C) 2009 Jason Newton <nevion@gmail.com
- #