miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XSDL: added PulseAudio support

Browse Source
This commit is contained in:
Sergii Pylypenko
2015-10-20 01:38:44 +03:00
parent 9f798adf6a
commit 7183f1c9c7
6 changed files with 82 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
project/jni/application/xserver/AndroidBuild.sh
View File

@@ -4,6 +4,14 @@ CURDIR=`pwd`
PACKAGE_NAME=`grep AppFullName AndroidAppSettings.cfg | sed 's/.*=//'`
[ -e pulseaudio/android-build.sh ] && {
[ -e pulseaudio/$1/install/bin/pulseaudio ] || {
cd pulseaudio
./android-build.sh || exit 1
cd ..
} || exit 1
} || exit 1
../setEnvironment-$1.sh sh -c '\
$CC $CFLAGS -c main.c -o main-'"$1.o" || exit 1
../setEnvironment-$1.sh sh -c '\
@@ -70,21 +78,34 @@ hw/kdrive/linux/.libs/liblinux.a \
rm -rf $CURDIR/tmp-$1
mkdir -p $CURDIR/tmp-$1
cd $CURDIR/tmp-$1
cp $CURDIR/xserver/data/busybox-$1 ./busybox
#cp $CURDIR/pulseaudio/pulseaudio-$1 ./pulseaudio
cp $CURDIR/ssh ./
cp $CURDIR/sshpass ./
cp -f $CURDIR/xserver/data/busybox-$1 ./busybox
cp -f $CURDIR/ssh ./
cp -f $CURDIR/sshpass ./
mkdir -p usr/bin
# Executables linked with NDK, which crash on Lollipop.
for f in xhost xkbcomp xli xsel; do cp $CURDIR/xserver/android/$1/$f ./usr/bin/$f ; done
for f in xhost xkbcomp xli xsel; do cp -f $CURDIR/xserver/android/$1/$f ./usr/bin/$f ; done
# Statically-linked prebuilt executables, generated using Debian chroot.
# There are no executables for old ARMv5, so we'll use NDK executables instead for that arch.
#for f in xhost xkbcomp xli xsel; do cp $CURDIR/xserver/data/$f-$1 ./usr/bin/$f ; done
rm -f ../AndroidData/binaries-$1.zip
zip -r ../AndroidData/binaries-$1.zip .
# Executables linked with NDK with -pie, which crash on pre-Lollipop.
for f in xhost xkbcomp xli xsel; do rm ./usr/bin/$f ; cp $CURDIR/xserver/android/$1/pie/$f ./usr/bin/$f ; done
for f in xhost xkbcomp xli xsel; do rm ./usr/bin/$f ; cp -f $CURDIR/xserver/android/$1/pie/$f ./usr/bin/$f ; done
cp $CURDIR/xserver/data/busybox-$1-pie ./busybox
# PulseAudio - PIE only
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
rm -f ../AndroidData/binaries-$1-pie.zip
zip -r ../AndroidData/binaries-$1-pie.zip .