Ticket #13252: build-plugins-20180331.patch
File build-plugins-20180331.patch, 7.8 KB (added by , 6 years ago) |
---|
-
android/makelibs.sh
commit 8dc778b442bc9f2d5098481532e047a58881a9d7 Author: Mark Spieth <mspieth@digivation.com.au> Date: Fri Mar 30 15:19:48 2018 +1100 Android: build mythplugins refs #13252 diff --git a/android/makelibs.sh b/android/makelibs.sh index 9f15a4c..6ef391d 100755
a b while : ; do 49 49 shift 50 50 BUILD_EXIV2=1 51 51 ;; 52 flac) 53 shift 54 BUILD_FLAC=1 55 ;; 56 ogg) 57 shift 58 BUILD_OGG=1 59 ;; 60 vorbis) 61 shift 62 BUILD_VORBIS=1 63 ;; 52 64 libxml2) 53 65 shift 54 66 BUILD_LIBXML2=1 … … while : ; do 100 112 BUILD_LAME=1 101 113 BUILD_EXIV2=1 102 114 BUILD_ICU=1 115 BUILD_FLAC=1 116 BUILD_VORBIS=1 117 BUILD_OGG=1 103 118 #BUILD_LIBXML2=1 104 119 #BUILD_LIBXSLT=1 105 120 #BUILD_GLIB=1 … … while : ; do 142 157 echo " iconv" 143 158 echo " mariadb" 144 159 echo " lame" 160 echo " ogg" 161 echo " vorbis" 162 echo " flac" 145 163 echo " exiv2" 146 164 echo " icu" 147 165 echo " qtwebkit" … … while : ; do 157 175 done 158 176 159 177 QTMAJORVERSION=5.10 160 QTVERSION=$QTMAJORVERSION. 0178 QTVERSION=$QTMAJORVERSION.1 161 179 export ANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL:-21} 162 180 export ANDROID_SDK_PLATFORM=android-$ANDROID_NATIVE_API_LEVEL 163 181 export ANDROID_NDK_PLATFORM=android-$ANDROID_NATIVE_API_LEVEL … … popd 731 749 return $ERR 732 750 } 733 751 752 build_flac() { 753 rm -rf build 754 FLAC=flac-1.3.2 755 echo -e "\n**** $FLAC ****" 756 setup_lib https://ftp.osuosl.org/pub/xiph/releases/flac/$FLAC.tar.xz $FLAC 757 pushd $FLAC 758 OPATH=$PATH 759 760 if [ $CLEAN == 1 ]; then 761 make distclean || true 762 fi 763 764 local CPUOPT= 765 if [ $ARM64 == 1 ]; then 766 CPUOPT="-march=$CPU_ARCH" 767 else 768 CPUOPT="-march=$CPU_ARCH" 769 fi 770 771 ./configure --help 772 ./configure \ 773 CFLAGS="-isysroot $SYSROOT $CPUOPT $ANDROID_API_DEF" \ 774 CXXFLAGS="-isysroot $SYSROOT $CPUOPT $ANDROID_API_DEF" \ 775 RANLIB=${CROSSPATH2}ranlib \ 776 OBJDUMP=${CROSSPATH2}objdump \ 777 AR=${CROSSPATH2}ar \ 778 CC="$CROSSPATH/$MY_ANDROID_NDK_TOOLS_PREFIX-gcc" \ 779 CXX="$CROSSPATH/$MY_ANDROID_NDK_TOOLS_PREFIX-g++" \ 780 CPP="$CROSSPATH/$MY_ANDROID_NDK_TOOLS_PREFIX-cpp" \ 781 PKG_CONFIG_PATH=$PKG_CONFIG_LIBDIR/pkgconfig \ 782 --with-sysroot=$INSTALLROOT \ 783 --host=$MY_ANDROID_NDK_TOOLS_PREFIX \ 784 --prefix=$INSTALLROOT \ 785 --enable-shared \ 786 --enable-static && 787 make -C src/libFLAC -j$NCPUS && 788 make -C include install 789 make -C src/libFLAC install 790 ERR=$? 791 792 # --with-ogg-libraries=$INSTALLROOT/lib \ 793 794 PATH=$OPATH 795 unset OPATH 796 popd 797 return $ERR 798 } 799 800 build_ogg() { 801 rm -rf build 802 LIBOGG=libogg-1.3.3 803 echo -e "\n**** $LIBOGG ****" 804 setup_lib https://ftp.osuosl.org/pub/xiph/releases/ogg/$LIBOGG.tar.xz $OGG 805 pushd $LIBOGG 806 OPATH=$PATH 807 808 if [ $CLEAN == 1 ]; then 809 make distclean || true 810 fi 811 812 local CPUOPT= 813 if [ $ARM64 == 1 ]; then 814 CPUOPT="-march=$CPU_ARCH" 815 else 816 CPUOPT="-march=$CPU_ARCH" 817 fi 818 819 ./configure \ 820 CFLAGS="-isysroot $SYSROOT $CPUOPT $ANDROID_API_DEF" \ 821 CXXFLAGS="-isysroot $SYSROOT $CPUOPT $ANDROID_API_DEF" \ 822 RANLIB=${CROSSPATH2}ranlib \ 823 OBJDUMP=${CROSSPATH2}objdump \ 824 AR=${CROSSPATH2}ar \ 825 CC="$CROSSPATH/$MY_ANDROID_NDK_TOOLS_PREFIX-gcc" \ 826 CXX="$CROSSPATH/$MY_ANDROID_NDK_TOOLS_PREFIX-g++" \ 827 CPP="$CROSSPATH/$MY_ANDROID_NDK_TOOLS_PREFIX-cpp" \ 828 PKG_CONFIG_PATH=$PKG_CONFIG_LIBDIR/pkgconfig \ 829 --host=$MY_ANDROID_NDK_TOOLS_PREFIX \ 830 --prefix=$INSTALLROOT \ 831 --enable-shared \ 832 --enable-static && 833 make -j$NCPUS && 834 make install 835 ERR=$? 836 837 PATH=$OPATH 838 unset OPATH 839 popd 840 return $ERR 841 } 842 843 build_vorbis() { 844 rm -rf build 845 LIBVORBIS=libvorbis-1.3.6 846 echo -e "\n**** $LIBVORBIS ****" 847 setup_lib https://ftp.osuosl.org/pub/xiph/releases/vorbis/$LIBVORBIS.tar.xz $LIBVORBIS 848 pushd $LIBVORBIS 849 OPATH=$PATH 850 851 if [ $CLEAN == 1 ]; then 852 make distclean || true 853 fi 854 855 local CPUOPT= 856 if [ $ARM64 == 1 ]; then 857 CPUOPT="-march=$CPU_ARCH" 858 else 859 CPUOPT="-march=$CPU_ARCH" 860 fi 861 862 ./configure \ 863 CFLAGS="-isysroot $SYSROOT $CPUOPT $ANDROID_API_DEF" \ 864 CXXFLAGS="-isysroot $SYSROOT $CPUOPT $ANDROID_API_DEF" \ 865 RANLIB=${CROSSPATH2}ranlib \ 866 OBJDUMP=${CROSSPATH2}objdump \ 867 AR=${CROSSPATH2}ar \ 868 CC="$CROSSPATH/$MY_ANDROID_NDK_TOOLS_PREFIX-gcc" \ 869 CXX="$CROSSPATH/$MY_ANDROID_NDK_TOOLS_PREFIX-g++" \ 870 CPP="$CROSSPATH/$MY_ANDROID_NDK_TOOLS_PREFIX-cpp" \ 871 PKG_CONFIG_PATH=$PKG_CONFIG_LIBDIR/pkgconfig \ 872 --host=$MY_ANDROID_NDK_TOOLS_PREFIX \ 873 --prefix=$INSTALLROOT \ 874 --enable-shared \ 875 --enable-static && 876 make -j$NCPUS && 877 make install 878 ERR=$? 879 880 PATH=$OPATH 881 unset OPATH 882 popd 883 return $ERR 884 } 885 734 886 build_libxml2() { 735 887 rm -rf build 736 888 LIBXML2=libxml2-2.9.5 … … fi 758 910 CC="$CROSSPATH/$MY_ANDROID_NDK_TOOLS_PREFIX-gcc" \ 759 911 CXX="$CROSSPATH/$MY_ANDROID_NDK_TOOLS_PREFIX-g++" \ 760 912 CPP="$CROSSPATH/$MY_ANDROID_NDK_TOOLS_PREFIX-cpp" \ 913 PKG_CONFIG_PATH=$PKG_CONFIG_LIBDIR/pkgconfig \ 761 914 --host=$MY_ANDROID_NDK_TOOLS_PREFIX \ 762 915 --prefix=$INSTALLROOT \ 763 916 --disable-xmp \ … … get_android_cmake 1993 2146 [ -n "$BUILD_MARIADB" ] && build_mariadb 1994 2147 [ -n "$BUILD_LAME" ] && build_lame 1995 2148 [ -n "$BUILD_EXIV2" ] && build_exiv2 2149 [ -n "$BUILD_OGG" ] && build_ogg 2150 [ -n "$BUILD_VORBIS" ] && build_vorbis 2151 [ -n "$BUILD_FLAC" ] && build_flac 1996 2152 [ -n "$BUILD_LIBXML2" ] && build_libxml2 1997 2153 [ -n "$BUILD_LIBXSLT" ] && build_libxslt 1998 2154 [ -n "$BUILD_FFI" ] && build_ffi -
android/mythbuild.sh
diff --git a/android/mythbuild.sh b/android/mythbuild.sh index 984ef3e..0308e33 100755
a b CPU=armv7-a 45 45 #CPU=cortex-a53 46 46 DEPLOYTYPE="--debug" 47 47 EXTRASPECS="-after QMAKE_CFLAGS-=-mfpu=vfp QMAKE_CXXFLAGS-=-mfpu=vfp" 48 BUILD_PLUGINS=1 48 49 49 50 while : ; do 50 51 case "$1" in … … case "$1" in 79 80 shift 80 81 ARM64=1 81 82 ;; 83 --no-plugins) 84 shift 85 BUILD_PLUGINS=0 86 ;; 82 87 "") 83 88 break 84 89 ;; … … case "$1" in 194 199 ;; 195 200 "fresh" ) 196 201 [ -n "$MYMYTHBUILDBASEPATH" ] && rm -r $MYMYTHBUILDBASEPATH 202 if [ -d "$INSTALLROOT" ]; then 203 rm -rf "$INSTALLROOT/include/mythtv" 204 rm -rf "$INSTALLROOT/lib/libmyth*" 205 rm -rf "$INSTALLROOT/libs/*/libmyth*" 206 rm -rf "$INSTALLROOT/build" 207 fi 197 208 exit 0 198 209 ;; 199 210 "bundle") … … function bundle_apk() { 260 271 for i in $MYTHINSTALLROOT/lib/libmythfilter*.so ; do 261 272 cp "$i" "$MYTHINSTALLROOT/libs/$ANDROID_TARGET_ARCH/" 262 273 done 274 # plugins are not automatically installed so copy them 275 for i in $MYTHINSTALLROOT/lib/libmythpluginmyth{archive,netvision,news,browser,game,music}.so \ 276 $MYTHINSTALLROOT/lib/libmyth{archivehelper,fillnetvision}.so \ 277 $MYTHINSTALLROOT/lib/lib{ogg,vorbis,vorbisfile,vorbisenc,FLAC}.so \ 278 ; do 279 if [ -e "$i" ]; then 280 cp "$i" "$MYTHINSTALLROOT/libs/$ANDROID_TARGET_ARCH/" 281 fi 282 done 263 283 VERSIONNAME=$(date +"%F" | tr -d '-')-$BUNDLE_NAME-$(grep "define MYTH_SOURCE_VERSION" libs/libmythbase/version.h | cut -d' ' -f 3 | tr -d '"') 264 284 # TODO: Eventually do something reasonable with versionCode. 265 285 VERSIONCODE=1 … … $MYTHTVSRC/configure \ 374 394 375 395 fi 376 396 397 make_plugins() { 398 pushd ../mythplugins 399 if [ ! -e stamp_configure_android ] ; then 400 ./configure \ 401 --compile-type=debug \ 402 --pkg-config=$(which pkg-config) \ 403 --prefix=/ \ 404 --runprefix=/ \ 405 --libdir-name=lib \ 406 --sysroot=$SYSROOT \ 407 --mythroot=$INSTALLROOT \ 408 --extra-cflags="$CRYSTAX_CFLAGS -D__ANDROID_API__=$ANDROID_NATIVE_API_LEVEL -DANDROID -I$INSTALLROOT/include -I$QTBASE/include $IGNOREDEFINES $NEONFLAGS " \ 409 --extra-cxxflags=" -D__ANDROID_API__=$ANDROID_NATIVE_API_LEVEL -DANDROID -I$INSTALLROOT/include -I$QTBASE/include $IGNOREDEFINES $NEONFLAGS " \ 410 --extra-ldflags="-Wl,-rpath-link,$INSTALLROOT/lib" \ 411 --qmake=$QTBASE/bin/qmake \ 412 --qmakespecs="android-g++ $EXTRASPECS" \ 413 && touch stamp_configure_android 414 415 fi 416 417 make -j$NCPUS 418 419 make install INSTALL_ROOT=$INSTALLROOT 420 421 popd 422 } 423 377 424 if [ -e stamp_configure_android ] ; then 378 425 set -e 379 426 echo "*** make ***" 380 427 make -j$NCPUS 381 428 echo "*** make install ***" 382 429 make install INSTALL_ROOT=$INSTALLROOT 430 if [ $BUILD_PLUGINS == 1 ]; then 431 echo "*** make plugins ***" 432 make_plugins 433 fi 383 434 echo "*** deploy-extra-libs ***" 384 435 deploy-extra-libs 385 436 echo "*** androiddeployqt ***"