mpd: Build with --disable-expat

Also harmonize some indentation.

diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh
index 89f5dcf..6c50cbc 100644 (file)
--- a/packages/mpd/build.sh
+++ b/packages/mpd/build.sh
@@ -5,47 +5,59 @@ TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_
 TERMUX_PKG_FOLDERNAME=MPD-$TERMUX_PKG_VERSION
 TERMUX_PKG_SHA256=42729305dbafb912bb9197698822b112aa78ab691f87433e37c511ce91ce0a0d
 TERMUX_PKG_DEPENDS="libcurl, libid3tag, libopus, libevent, fftw, libpulseaudio, libmpdclient, boost, openal-soft, libvorbis, libsqlite, ffmpeg"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-sndio --disable-alsa --disable-ao --disable-mad --without-tremor --disable-epoll --disable-iconv --disable-icu"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+--disable-alsa
+--disable-ao
+--disable-epoll
+--disable-expat
+--disable-iconv
+--disable-icu
+--disable-mad
+--disable-sndio
+--without-tremor
+"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_CONFFILES="$TERMUX_PREFIX/etc/mpd.conf"
+
 termux_step_pre_configure() {
        CXXFLAGS+=" -DTERMUX -UANDROID"
        LDFLAGS+=" -llog -lOpenSLES"
        NOCONFIGURE=1   ./autogen.sh
        rm -f /data/data/com.termux/files/usr/etc/mpd.conf
 }
+
 termux_step_make_install () {
        # Try to work around OpenSL ES library clashes:
-        # Linking against libOpenSLES causes indirect linkage against
-        # libskia.so, which links against the platform libjpeg.so and
-        # libpng.so, which are not compatible with the Termux ones.
-        #
-        # On Android N also liblzma seems to conflict.
-        make install
+       # Linking against libOpenSLES causes indirect linkage against
+       # libskia.so, which links against the platform libjpeg.so and
+       # libpng.so, which are not compatible with the Termux ones.
+       #
+       # On Android N also liblzma seems to conflict.
+       make install
        cp -f $TERMUX_PREFIX/share/doc/mpd/mpdconf.example /data/data/com.termux/files/usr/etc/mpd.conf
        mkdir -p $TERMUX_PREFIX/libexec
-        mkdir -p $TERMUX_PREFIX/var/mpd
+       mkdir -p $TERMUX_PREFIX/var/mpd
        mv $TERMUX_PREFIX/bin/mpd $TERMUX_PREFIX/libexec
-        local SYSTEM_LIBFOLDER=lib64
-        if [ $TERMUX_ARCH_BITS = 32 ]; then SYSTEM_LIBFOLDER=lib; fi
+       local SYSTEM_LIBFOLDER=lib64
+       if [ $TERMUX_ARCH_BITS = 32 ]; then SYSTEM_LIBFOLDER=lib; fi
 
-        echo "#!/bin/sh" > $TERMUX_PREFIX/bin/mpd
+       echo "#!/bin/sh" > $TERMUX_PREFIX/bin/mpd
        cat $TERMUX_SCRIPTDIR/packages/mpd/mpd-script.sh >> $TERMUX_PREFIX/bin/mpd
-        # Work around issues on devices having ffmpeg libraries
-        # in a system vendor dir, reported by live_the_dream on #termux:
-        local FFMPEG_LIBS="" lib
+       # Work around issues on devices having ffmpeg libraries
+       # in a system vendor dir, reported by live_the_dream on #termux:
+       local FFMPEG_LIBS="" lib
        # gnustl_shared needs to go first in every c++ app that uses audio directly.
        for lib in gnustl_shared curl ssl event opus vorbis avcodec avfilter avformat avutil postproc swresample swscale sqlite3; do
-                if [ -n "$FFMPEG_LIBS" ]; then FFMPEG_LIBS+=":"; fi
-                FFMPEG_LIBS+="$TERMUX_PREFIX/lib/lib${lib}.so"
-        done
-        echo "export LD_PRELOAD=$FFMPEG_LIBS" >> $TERMUX_PREFIX/bin/mpd
+               if [ -n "$FFMPEG_LIBS" ]; then FFMPEG_LIBS+=":"; fi
+               FFMPEG_LIBS+="$TERMUX_PREFIX/lib/lib${lib}.so"
+       done
+       echo "export LD_PRELOAD=$FFMPEG_LIBS" >> $TERMUX_PREFIX/bin/mpd
        chmod +x $TERMUX_PREFIX/bin/mpd
-        # /system/vendor/lib(64) needed for libqc-opt.so on
-        # a xperia z5 c, reported by BrainDamage on #termux:
-        echo "LD_LIBRARY_PATH=/system/$SYSTEM_LIBFOLDER:/system/vendor/$SYSTEM_LIBFOLDER:$TERMUX_PREFIX/lib exec $TERMUX_PREFIX/libexec/mpd \"\$@\"" >> $TERMUX_PREFIX/bin/mpd
-
+       # /system/vendor/lib(64) needed for libqc-opt.so on
+       # a xperia z5 c, reported by BrainDamage on #termux:
+       echo "LD_LIBRARY_PATH=/system/$SYSTEM_LIBFOLDER:/system/vendor/$SYSTEM_LIBFOLDER:$TERMUX_PREFIX/lib exec $TERMUX_PREFIX/libexec/mpd \"\$@\"" >> $TERMUX_PREFIX/bin/mpd
 }
+
 termux_step_create_debscripts() {
-echo 'mkdir -p $HOME/.mpd/playlists' >> postinst
+       echo 'mkdir -p $HOME/.mpd/playlists' >> postinst
 }