From 2f8ad960c0177f60ef0e809e39dd1d5596de4a2e Mon Sep 17 00:00:00 2001 From: Tom Yan Date: Mon, 7 Oct 2019 21:27:31 +0800 Subject: [PATCH] pulseaudio: unsplit package With commit 63dc34f being accepted, there isn't exactly a reason that pulseaudio should be splited into two packages anymore. --- packages/cava/build.sh | 4 ++-- packages/gst-plugins-good/build.sh | 3 ++- packages/libao/build.sh | 4 ++-- packages/libpulseaudio/client.conf.in.patch | 12 ------------ packages/libpulseaudio/pulseaudio.subpackage.sh | 3 --- packages/mpd/build.sh | 4 ++-- packages/mpv/build.sh | 4 ++-- packages/{libpulseaudio => pulseaudio}/aaudio.patch | 0 .../{libpulseaudio => pulseaudio}/bootstrap.sh.patch | 0 packages/{libpulseaudio => pulseaudio}/build.sh | 8 ++++---- .../{libpulseaudio => pulseaudio}/fix-paths.patch | 0 .../module-aaudio-sink.c | 0 .../{libpulseaudio => pulseaudio}/module-sles-sink.c | 0 .../module-sles-source.c | 0 .../{libpulseaudio => pulseaudio}/no_priv_drop.patch | 0 packages/{libpulseaudio => pulseaudio}/sles.patch | 0 16 files changed, 14 insertions(+), 28 deletions(-) delete mode 100644 packages/libpulseaudio/client.conf.in.patch delete mode 100644 packages/libpulseaudio/pulseaudio.subpackage.sh rename packages/{libpulseaudio => pulseaudio}/aaudio.patch (100%) rename packages/{libpulseaudio => pulseaudio}/bootstrap.sh.patch (100%) rename packages/{libpulseaudio => pulseaudio}/build.sh (94%) rename packages/{libpulseaudio => pulseaudio}/fix-paths.patch (100%) rename packages/{libpulseaudio => pulseaudio}/module-aaudio-sink.c (100%) rename packages/{libpulseaudio => pulseaudio}/module-sles-sink.c (100%) rename packages/{libpulseaudio => pulseaudio}/module-sles-source.c (100%) rename packages/{libpulseaudio => pulseaudio}/no_priv_drop.patch (100%) rename packages/{libpulseaudio => pulseaudio}/sles.patch (100%) diff --git a/packages/cava/build.sh b/packages/cava/build.sh index 3986cdaa4..144d5bdd9 100644 --- a/packages/cava/build.sh +++ b/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 diff --git a/packages/gst-plugins-good/build.sh b/packages/gst-plugins-good/build.sh index 41f55a24b..64cf78c44 100644 --- a/packages/gst-plugins-good/build.sh +++ b/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" diff --git a/packages/libao/build.sh b/packages/libao/build.sh index 16cdd3a58..f01778953 100644 --- a/packages/libao/build.sh +++ b/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" diff --git a/packages/libpulseaudio/client.conf.in.patch b/packages/libpulseaudio/client.conf.in.patch deleted file mode 100644 index 93f47722e..000000000 --- a/packages/libpulseaudio/client.conf.in.patch +++ /dev/null @@ -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 - diff --git a/packages/libpulseaudio/pulseaudio.subpackage.sh b/packages/libpulseaudio/pulseaudio.subpackage.sh deleted file mode 100644 index 4949f2b75..000000000 --- a/packages/libpulseaudio/pulseaudio.subpackage.sh +++ /dev/null @@ -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" diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh index 342090a98..082fc461c 100644 --- a/packages/mpd/build.sh +++ b/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 diff --git a/packages/mpv/build.sh b/packages/mpv/build.sh index 47464536b..e303acc6a 100644 --- a/packages/mpv/build.sh +++ b/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() { diff --git a/packages/libpulseaudio/aaudio.patch b/packages/pulseaudio/aaudio.patch similarity index 100% rename from packages/libpulseaudio/aaudio.patch rename to packages/pulseaudio/aaudio.patch diff --git a/packages/libpulseaudio/bootstrap.sh.patch b/packages/pulseaudio/bootstrap.sh.patch similarity index 100% rename from packages/libpulseaudio/bootstrap.sh.patch rename to packages/pulseaudio/bootstrap.sh.patch diff --git a/packages/libpulseaudio/build.sh b/packages/pulseaudio/build.sh similarity index 94% rename from packages/libpulseaudio/build.sh rename to packages/pulseaudio/build.sh index c7b95c386..c08546397 100644 --- a/packages/libpulseaudio/build.sh +++ b/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 diff --git a/packages/libpulseaudio/fix-paths.patch b/packages/pulseaudio/fix-paths.patch similarity index 100% rename from packages/libpulseaudio/fix-paths.patch rename to packages/pulseaudio/fix-paths.patch diff --git a/packages/libpulseaudio/module-aaudio-sink.c b/packages/pulseaudio/module-aaudio-sink.c similarity index 100% rename from packages/libpulseaudio/module-aaudio-sink.c rename to packages/pulseaudio/module-aaudio-sink.c diff --git a/packages/libpulseaudio/module-sles-sink.c b/packages/pulseaudio/module-sles-sink.c similarity index 100% rename from packages/libpulseaudio/module-sles-sink.c rename to packages/pulseaudio/module-sles-sink.c diff --git a/packages/libpulseaudio/module-sles-source.c b/packages/pulseaudio/module-sles-source.c similarity index 100% rename from packages/libpulseaudio/module-sles-source.c rename to packages/pulseaudio/module-sles-source.c diff --git a/packages/libpulseaudio/no_priv_drop.patch b/packages/pulseaudio/no_priv_drop.patch similarity index 100% rename from packages/libpulseaudio/no_priv_drop.patch rename to packages/pulseaudio/no_priv_drop.patch diff --git a/packages/libpulseaudio/sles.patch b/packages/pulseaudio/sles.patch similarity index 100% rename from packages/libpulseaudio/sles.patch rename to packages/pulseaudio/sles.patch