Merge pull request #4404 from tomty89/pulseaudio

pulseaudio: Update from 12.2 to 13.0

packages/cava/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Console-based Audio Visualizer. Works with MPD and Pulse
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli"
 TERMUX_PKG_VERSION=0.6.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=98b880e7e704ed457863f379f31b488e06076bb34a5de02825096969b916a78d
 TERMUX_PKG_SRCURL=https://github.com/karlstav/cava/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="ncurses,fftw,pulseaudio"

packages/cmus/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://cmus.github.io/
 TERMUX_PKG_DESCRIPTION="Small, fast and powerful console music player"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=2.8.0
-TERMUX_PKG_REVISION=4
+TERMUX_PKG_REVISION=5
 TERMUX_PKG_DEPENDS="libandroid-support, libiconv, ncurses, pulseaudio, ffmpeg, libmad, opusfile, libflac, libvorbis"
 TERMUX_PKG_SRCURL=https://github.com/cmus/cmus/archive/2748d40bb670558b523d5b47b4af442e82c7ffd2.tar.gz
 TERMUX_PKG_SHA256=37b5a1889a97cdfd319880bc5925c179119330163315dc3f408145c66d352f6b

packages/gst-plugins-good/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="GStreamer Good Plug-ins"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=1.16.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=9fbabe69018fcec707df0b71150168776040cde6c1a26bb5a82a136755fa8f1f
 TERMUX_PKG_DEPENDS="gst-plugins-base, libcaca, libsoup, libjpeg-turbo, libpng, libflac, libbz2, libvpx, pulseaudio, libmp3lame, gstreamer, libogg, zlib"

packages/libao/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.xiph.org/ao/
 TERMUX_PKG_DESCRIPTION="A cross platform audio library"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=1.2.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=df8a6d0e238feeccb26a783e778716fb41a801536fe7b6fce068e313c0e2bf4d
 TERMUX_PKG_SRCURL=https://github.com/xiph/libao/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="pulseaudio"

packages/mpd/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.musicpd.org
 TERMUX_PKG_DESCRIPTION="Music player daemon"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=0.21.13
-TERMUX_PKG_REVISION=6
+TERMUX_PKG_REVISION=7
 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=0c71ff34aa4def30cd931977cbfe3deb6ec815a726b8c5343f1b8e5707136ebf
 TERMUX_PKG_DEPENDS="libc++, libcurl, libid3tag, libopus, pulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg, libnfs, zlib"

packages/mpv/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://mpv.io/
 TERMUX_PKG_DESCRIPTION="Command-line media player"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_VERSION=0.29.1
-TERMUX_PKG_REVISION=10
+TERMUX_PKG_REVISION=11
 TERMUX_PKG_SRCURL=https://github.com/mpv-player/mpv/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623
 TERMUX_PKG_DEPENDS="ffmpeg, libandroid-glob, libandroid-support, libarchive, libcaca, libiconv, liblua52, pulseaudio, openal-soft, zlib"

packages/pulseaudio/0001-atomic-Explicitly-cast-void-to-unsigned-long.patch

@@ -0,0 +1,22 @@
+From e4450d8b586103ec1414e2d6245ff34a9096d97a Mon Sep 17 00:00:00 2001
+From: Peter Levine <plevine457@gmail.com>
+Date: Thu, 26 Sep 2019 07:24:40 +0000
+Subject: [PATCH] atomic: Explicitly cast void* to unsigned long
+
+
+diff --git a/src/pulsecore/atomic.h b/src/pulsecore/atomic.h
+index a82ca83c5..e5c140109 100644
+--- a/src/pulsecore/atomic.h
++++ b/src/pulsecore/atomic.h
+@@ -117,7 +117,7 @@ static inline void* pa_atomic_ptr_load(const pa_atomic_ptr_t *a) {
+ }
+ 
+ static inline void pa_atomic_ptr_store(pa_atomic_ptr_t *a, void* p) {
+-    __atomic_store_n(&a->value, p, __ATOMIC_SEQ_CST);
++    __atomic_store_n(&a->value, (unsigned long) p, __ATOMIC_SEQ_CST);
+ }
+ 
+ #else
+-- 
+2.23.0
+

packages/pulseaudio/bootstrap.sh.patch

@@ -1,19 +0,0 @@
-diff -u -r ../pulseaudio-12.2/bootstrap.sh ./bootstrap.sh
---- ../pulseaudio-12.2/bootstrap.sh	2018-07-16 14:40:33.000000000 +0000
-+++ ./bootstrap.sh	2018-11-27 23:12:39.509242963 +0000
-@@ -35,15 +35,10 @@
-     exit 1
- fi
- # Other necessary programs
--if ! autopoint --version &>/dev/null ; then
--    echo "autopoint is required to bootstrap this program"
--    exit 1
--fi
- if ! intltoolize --version >/dev/null ; then
-     echo "intltoolize is required to bootstrap this program"
-     exit 1
- fi
--autopoint --force
- AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
- 
- if test "x$NOCONFIGURE" = "x"; then

packages/pulseaudio/build.sh

@@ -1,9 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio
 TERMUX_PKG_DESCRIPTION="A featureful, general-purpose sound server"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_VERSION=12.2
-TERMUX_PKG_REVISION=22
-TERMUX_PKG_SHA256=809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055
+TERMUX_PKG_VERSION=13.0
+TERMUX_PKG_SHA256=961b23ca1acfd28f2bc87414c27bb40e12436efcf2158d29721b1e89f3f28057
 TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/pulseaudio/releases/pulseaudio-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="libltdl, libsndfile, libandroid-glob, libsoxr, speexdsp"
 TERMUX_PKG_BREAKS="libpulseaudio-dev, libpulseaudio"
@@ -20,13 +19,10 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-neon-opt
 --with-database=simple
 --disable-memfd
 --disable-gsettings
-ax_cv_PTHREAD_PRIO_INHERIT=no
-ac_cv_func_posix_madvise=no"
+ax_cv_PTHREAD_PRIO_INHERIT=no"
+TERMUX_PKG_CONFFILES="etc/pulse/client.conf etc/pulse/daemon.conf etc/pulse/default.pa etc/pulse/system.pa"
 
 termux_step_pre_configure() {
-	# Avoid aclocal-1.15 dependency:
-	NOCONFIGURE=1 ./bootstrap.sh
-
 	# Our aaudio sink module needs libaaudio.so from a later android api version:
 	local _NDK_ARCHNAME=$TERMUX_ARCH
 	if [ "$TERMUX_ARCH" = "aarch64" ]; then
@@ -45,9 +41,7 @@ termux_step_pre_configure() {
 	mkdir $TERMUX_PKG_SRCDIR/src/modules/aaudio
 	cp $TERMUX_PKG_BUILDER_DIR/module-aaudio-sink.c $TERMUX_PKG_SRCDIR/src/modules/aaudio
 
-	intltoolize --automake --copy --force
-
-	LDFLAGS+=" -llog -landroid-glob"
+	export LIBS="-llog -landroid-glob"
 }
 
 termux_step_post_make_install() {

packages/pulseaudio/module-aaudio-sink.c

@@ -263,9 +263,8 @@ static int state_func_io(pa_sink *s, pa_sink_state_t state, pa_suspend_cause_t s
     return 0;
 }
 
-static int reconfigure_func(pa_sink *s, pa_sample_spec *ss, bool passthrough) {
+static void reconfigure_func(pa_sink *s, pa_sample_spec *ss, bool passthrough) {
     s->sample_spec.rate = ss->rate;
-    return 0;
 }
 
 static void process_rewind(pa_sink *s) {

packages/pulseaudio/module-sles-source.c

@@ -74,7 +74,6 @@ struct userdata {
     pa_core *core;
     pa_module *module;
     pa_source *source;
-    pa_sink   *sink;
     pa_thread *thread;
     pa_thread_mq thread_mq;
     pa_rtpoll *rtpoll;
@@ -134,7 +133,7 @@ static int state_func(pa_source *s, pa_source_state_t state, pa_suspend_cause_t
         (state == PA_SOURCE_SUSPENDED || state == PA_SOURCE_UNLINKED))
 	(*u->recordItf)->SetRecordState(u->recordItf, SL_RECORDSTATE_STOPPED);
     else if ((s->state == PA_SOURCE_SUSPENDED || s->state == PA_SOURCE_INIT) &&
-             PA_SINK_IS_OPENED(state))
+             PA_SOURCE_IS_OPENED(state))
     	(*u->recordItf)->SetRecordState(u->recordItf, SL_RECORDSTATE_RECORDING);
     return 0;
 }

packages/sox/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://sox.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Command line utility for converting between and applying effects to various audio files formats"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_VERSION=14.4.2
-TERMUX_PKG_REVISION=14
+TERMUX_PKG_REVISION=15
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/sox/sox/${TERMUX_PKG_VERSION}/sox-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=81a6956d4330e75b5827316e44ae381e6f1e8928003c6aa45896da9041ea149c
 TERMUX_PKG_DEPENDS="file, libpng, libmp3lame, libvorbis, libandroid-glob, libflac, libid3tag, libmad, pulseaudio, opusfile, libsndfile, zlib"