Merge pull request #4400 from tomty89/pulseaudio

pulseaudio: unsplit package

packages/cava/build.sh

@@ -3,10 +3,10 @@ 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=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=98b880e7e704ed457863f379f31b488e06076bb34a5de02825096969b916a78d
 TERMUX_PKG_SRCURL=https://github.com/karlstav/cava/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="ncurses,fftw,libpulseaudio"
+TERMUX_PKG_DEPENDS="ncurses,fftw,pulseaudio"
 TERMUX_PKG_BUILD_DEPENDS="libtool"
 TERMUX_PKG_BUILD_IN_SRC=true
 

packages/gst-plugins-good/build.sh

@@ -2,9 +2,10 @@ 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_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, libpulseaudio, libmp3lame, gstreamer, libogg, zlib"
+TERMUX_PKG_DEPENDS="gst-plugins-base, libcaca, libsoup, libjpeg-turbo, libpng, libflac, libbz2, libvpx, pulseaudio, libmp3lame, gstreamer, libogg, zlib"
 TERMUX_PKG_BUILD_IN_SRC=true
 # pcre needed by glib. libxml2 needed by libsoup
 TERMUX_PKG_BUILD_DEPENDS="glib, pcre, libxml2"

packages/libao/ao_pulse.c.patch

@@ -1,15 +1,37 @@
---- ../cache/libao-1.2.2/src/plugins/pulse/ao_pulse.c	2016-11-14 16:03:30.000000000 +0800
-+++ ./src/plugins/pulse/ao_pulse.c	2018-08-02 00:59:31.723282524 +0800
-@@ -40,7 +40,7 @@
+diff --git a/src/plugins/pulse/ao_pulse.c b/src/plugins/pulse/ao_pulse.c
+index 2d10d57..6780830 100644
+--- a/src/plugins/pulse/ao_pulse.c
++++ b/src/plugins/pulse/ao_pulse.c
+@@ -41,7 +41,7 @@
  #include <ao/ao.h>
  #include <ao/plugin.h>
  
 -#define AO_PULSE_BUFFER_TIME 20000
-+#define AO_PULSE_BUFFER_TIME 50000
++#define AO_PULSE_BUFFER_TIME 20
  
  /* Unfortunately libao doesn't allow "const" for these structures... */
  static char * ao_pulse_options[] = {
-@@ -255,12 +255,10 @@
+@@ -73,7 +73,7 @@ typedef struct ao_pulse_internal {
+     struct pa_simple *simple;
+     char *server, *sink, *client_name;
+     pa_usec_t static_delay;
+-    pa_usec_t buffer_time;
++    int buffer_time;
+ } ao_pulse_internal;
+ 
+ /* Yes, this is very ugly, but required nonetheless... */
+@@ -174,8 +174,8 @@ int ao_plugin_set_option(ao_device *device, const char *key, const char *value)
+     } else if (!strcmp(key, "client_name")) {
+         free(internal->client_name);
+         internal->client_name = strdup(value);
+-    }else if (!strcmp(key, "buffer_time")){
+-      internal->buffer_time = atoi(value) * 1000;
++    } else if (!strcmp(key, "buffer_time")) {
++        internal->buffer_time = atoi(value);
+     }
+ 
+     return 1;
+@@ -256,12 +256,10 @@ int ao_plugin_open(ao_device *device, ao_sample_format *format) {
      }
  
      /* buffering attributes */
@@ -20,7 +42,7 @@
 -      ((format->bits+7)/8) * device->output_channels;
 -    battr.minreq = battr.tlength/4;
 -    battr.maxlength = battr.tlength+battr.minreq;
-+    battr.tlength = internal->buffer_time * format->rate / 1000000 *
++    battr.tlength = internal->buffer_time * format->rate / 1000 *
 +      (format->bits / 8) * device->output_channels;
  
      internal->simple = pa_simple_new(internal->server, t, PA_STREAM_PLAYBACK,

packages/libao/build.sh

@@ -2,10 +2,10 @@ 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_SHA256=df8a6d0e238feeccb26a783e778716fb41a801536fe7b6fce068e313c0e2bf4d
 TERMUX_PKG_SRCURL=https://github.com/xiph/libao/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="pulseaudio, libpulseaudio"
-TERMUX_PKG_BUILD_DEPENDS="libpulseaudio"
+TERMUX_PKG_DEPENDS="pulseaudio"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-pulse"
 TERMUX_PKG_CONFFILES="etc/libao.conf"
 
@@ -18,6 +18,7 @@ termux_step_post_make_install () {
 	mkdir -p $TERMUX_PREFIX/etc/
 	cat << EOF > $TERMUX_PREFIX/etc/libao.conf
 default_driver=pulse
+buffer_time=50
 quiet
 EOF
 }

packages/libpulseaudio/client.conf.in.patch

@@ -1,12 +0,0 @@
-diff --git a/src/pulse/client.conf.in~ b/src/pulse/client.conf.in
-index 26b7790..a29cf86 100644
---- a/src/pulse/client.conf.in~
-+++ b/src/pulse/client.conf.in
-@@ -23,6 +23,7 @@
- ; default-dbus-server =
- 
- ; autospawn = yes
-+daemon-binary = @TERMUX_PREFIX@/bin/pulseaudio
- ; daemon-binary = @PA_BINARY@
- ; extra-arguments = --log-target=syslog
- 

packages/libpulseaudio/pulseaudio.subpackage.sh

@@ -1,3 +0,0 @@
-TERMUX_SUBPKG_INCLUDE="bin/ etc/ lib/libcli.so* lib/libprotocol-*.so* lib/librtp.so* lib/pulse-${TERMUX_PKG_VERSION}/ share/"
-TERMUX_SUBPKG_DESCRIPTION="A featureful, general-purpose sound server"
-TERMUX_SUBPKG_CONFFILES="etc/pulse/client.conf etc/pulse/daemon.conf etc/pulse/default.pa etc/pulse/system.pa"

packages/mpd/build.sh

@@ -2,10 +2,10 @@ 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=5
+TERMUX_PKG_REVISION=6
 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, libpulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg, libnfs, zlib"
+TERMUX_PKG_DEPENDS="libc++, libcurl, libid3tag, libopus, pulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg, libnfs, zlib"
 TERMUX_PKG_BUILD_DEPENDS="boost"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dalsa=disabled

packages/mpv/build.sh

@@ -2,10 +2,10 @@ 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=9
+TERMUX_PKG_REVISION=10
 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, libpulseaudio, openal-soft, zlib"
+TERMUX_PKG_DEPENDS="ffmpeg, libandroid-glob, libandroid-support, libarchive, libcaca, libiconv, liblua52, pulseaudio, openal-soft, zlib"
 TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/applications"
 
 termux_step_pre_configure() {

packages/pulseaudio/build.sh

@@ -1,13 +1,13 @@
 TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio
-TERMUX_PKG_DESCRIPTION="A featureful, general-purpose sound server - shared libraries"
+TERMUX_PKG_DESCRIPTION="A featureful, general-purpose sound server"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_VERSION=12.2
-TERMUX_PKG_REVISION=21
+TERMUX_PKG_REVISION=22
 TERMUX_PKG_SHA256=809668ffc296043779c984f53461c2b3987a45b7a25eb2f0a1d11d9f23ba4055
 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"
-TERMUX_PKG_REPLACES="libpulseaudio-dev"
+TERMUX_PKG_BREAKS="libpulseaudio-dev, libpulseaudio"
+TERMUX_PKG_REPLACES="libpulseaudio-dev, libpulseaudio"
 TERMUX_PKG_BUILD_DEPENDS="libtool"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-neon-opt
 --disable-alsa