X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/674a9bc39e1ea90fab7b04b2e8f2c37b95df8b5d..0c45fbcde7f171e0102b8792dd05761cf197efd8:/packages/libpulseaudio/build.sh

diff --git a/packages/libpulseaudio/build.sh b/packages/libpulseaudio/build.sh
index 3b081389..61dd4991 100644
--- a/packages/libpulseaudio/build.sh
+++ b/packages/libpulseaudio/build.sh
@@ -1,10 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio
 TERMUX_PKG_DESCRIPTION="A featureful, general-purpose sound server - shared libraries"
 TERMUX_PKG_VERSION=11.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SHA256=f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e
 TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/pulseaudio/releases/pulseaudio-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_DEPENDS="libltdl, libsndfile, libandroid-glob"
+TERMUX_PKG_DEPENDS="libltdl, libsndfile, libandroid-glob, libsoxr"
 TERMUX_PKG_BUILD_DEPENDS="libtool"
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/vala"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-neon-opt
@@ -14,7 +14,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-neon-opt
 --disable-openssl
 --without-caps
 --with-database=simple
---disable-memfd"
+--disable-memfd
+--bindir=$TERMUX_PREFIX/libexec"
 TERMUX_PKG_CONFFILES="etc/pulse/client.conf etc/pulse/daemon.conf etc/pulse/default.pa etc/pulse/system.pa"
 
 termux_step_pre_configure () {
@@ -40,17 +41,18 @@ termux_step_post_make_install () {
 	sed -i $TERMUX_PREFIX/etc/pulse/default.pa \
 		-e '/^load-module module-detect$/s/^/#/'
 	echo "load-module module-sles-sink" >> $TERMUX_PREFIX/etc/pulse/default.pa
-	cd $TERMUX_PREFIX/bin
+	cd $TERMUX_PREFIX/libexec
 
 	for bin in esdcompat pacat pacmd pactl pasuspender pulseaudio; do
-		mv $bin ../libexec
+		rm -f ../bin/$bin
 		local PA_LIBS="" lib
 		for lib in android-glob pulse pulsecommon-11.1 pulsecore-11.1; do
 			if [ -n "$PA_LIBS" ]; then PA_LIBS+=":"; fi
 			PA_LIBS+="$TERMUX_PREFIX/lib/lib${lib}.so"
 		done
+		echo "#!$TERMUX_PREFIX/bin/sh" >> $TERMUX_PREFIX/bin/$bin
 		echo "export LD_PRELOAD=$PA_LIBS" >> $TERMUX_PREFIX/bin/$bin
-		echo "LD_LIBRARY_PATH=/system/$SYSTEM_LIB:/system/vendor/$SYSTEM_LIB:/data/data/com.termux/files/usr/lib /data/data/com.termux/files/usr/libexec/$bin \$@" >> $TERMUX_PREFIX/bin/$bin
-		chmod +x $bin
+		echo "LD_LIBRARY_PATH=/system/$SYSTEM_LIB:/system/vendor/$SYSTEM_LIB:$TERMUX_PREFIX/lib exec $TERMUX_PREFIX/libexec/$bin \$@" >> $TERMUX_PREFIX/bin/$bin
+		chmod +x $TERMUX_PREFIX/bin/$bin
 	done
 }