XSDL: fixed PulseAudio

This commit is contained in:
Sergii Pylypenko
2019-10-29 22:17:43 +02:00
parent ae4f496106
commit 769a99cbd8
8 changed files with 50 additions and 19 deletions

View File

@@ -4,7 +4,6 @@ CURDIR=`pwd`
PACKAGE_NAME=`grep AppFullName AndroidAppSettings.cfg | sed 's/.*=//'`
if false; then # Disable PulseAudio for now
if [ -e pulseaudio/android-build.sh ]; then
[ -e pulseaudio/$1/install/bin/pulseaudio ] || {
cd pulseaudio
@@ -12,7 +11,6 @@ if [ -e pulseaudio/android-build.sh ]; then
cd ..
} || exit 1
fi
fi # Disable PulseAudio for now
../setEnvironment-$1.sh sh -c '\
$CC $CFLAGS -Werror=format -c main.c -o main-'"$1.o" || exit 1
@@ -81,19 +79,11 @@ cp -f $CURDIR/xserver/data/busybox-$1 ./busybox
for f in xhost xkbcomp xloadimage xsel; do cp -f $CURDIR/xserver/android/$1/$f ./$f ; done
# Statically-linked prebuilt executables, generated using Debian chroot.
if false; then # Disable PulseAudio for now
mkdir -p pulse
cp -f $CURDIR/pulseaudio/$1/install/bin/pulseaudio pulse/
cp -f $CURDIR/pulseaudio/$1/install/lib/libpulse.so.0.18.2 pulse/libpulse.so.0
#ln -sf libpulse.so.0.18.2 pulse/libpulse.so.0
#ln -sf libpulse.so.0.18.2 pulse/libpulse.so
cp -f $CURDIR/pulseaudio/$1/install/lib/libpulsecore-7.0.so pulse/
cp -f $CURDIR/pulseaudio/$1/install/lib/pulseaudio/libpulsecommon-7.0.so pulse/
for F in $CURDIR/pulseaudio/$1/install/lib/pulse-7.0/modules/*.so; do
cp -f $F pulse/
done
cp -f $CURDIR/pulseaudio/android-pulseaudio.conf pulse/pulseaudio.conf
fi # Disable PulseAudio for now
cp -f $CURDIR/pulseaudio/$1/install/bin/pulseaudio ./
cp -f $CURDIR/pulseaudio/$1/install/lib/*.so ./
cp -f $CURDIR/pulseaudio/$1/install/lib/pulseaudio/*.so ./
cp -f $CURDIR/pulseaudio/$1/install/lib/pulse-*/modules/*.so ./
cp -f $CURDIR/pulseaudio/$1/*/install/lib/*.so ./
rm -f ../AndroidData/binaries-$1.zip
rm -rf ../AndroidData/lib