Alexandre Julliard : packaging/android: Stop building the libraries that are now bundled with Wine.
Module: tools Branch: master Commit: abf83815628102f18b57198623bdf73c57d85262 URL: https://source.winehq.org/git/tools.git/?a=commit;h=abf83815628102f18b571986... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 22:31:07 2021 +0200 packaging/android: Stop building the libraries that are now bundled with Wine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/android/build-apks | 93 ++------------------------------------------ 1 file changed, 3 insertions(+), 90 deletions(-) diff --git a/packaging/android/build-apks b/packaging/android/build-apks index f28a994..ef245cd 100755 --- a/packaging/android/build-apks +++ b/packaging/android/build-apks @@ -34,18 +34,11 @@ makeflags="--no-print-directory $silent -j$(nproc)" android_ndk=android-ndk-r21d llvm_mingw=llvm-mingw-20201020-ucrt-ubuntu-18.04 gradle=gradle-3.5.1 -png=libpng-1.6.37 -jpeg=jpeg-9d freetype=freetype-2.10.4 -lcms2=lcms2-2.11 -tiff=tiff-4.1.0 -xml2=libxml2-2.9.10 -xslt=libxslt-1.1.34 gmp=gmp-6.2.1 nettle=nettle-3.6 gnutls=gnutls-3.7.0 openldap=openldap-2.4.56 -mpeg=mpg123-1.26.3 cups=cups-2.3.3 gecko=wine-gecko-2.47.2 @@ -86,53 +79,10 @@ config_llvm_mingw () download $llvm_mingw https://github.com/mstorsjo/llvm-mingw/releases/download/20201020/$llvm_ming... } -config_png () -{ - download $png $png.tar.xz https://sourceforge.net/projects/libpng/files/libpng16/1.6.37/$png.tar.xz/do... - (cd $png && $run_configure && make $makeflags) -} - -config_jpeg () -{ - download $jpeg http://www.ijg.org/files/jpegsrc.v9d.tar.gz - (cd $jpeg && $run_configure && make $makeflags) - # rename libjpeg.so to avoid conflicts with the system one - cp $jpeg/.libs/libjpeg.so $jpeg/.libs/libwjpeg.so -} - config_freetype () { - test -d $png || config_png download $freetype http://download.savannah.gnu.org/releases/freetype/$freetype.tar.xz - pngdir=$(pwd)/$png - (cd $freetype && $run_configure LIBPNG_CFLAGS=-I$pngdir LIBPNG_LIBS="-L$pngdir/.libs -lpng16" && make $makeflags) -} - -config_lcms2 () -{ - version=$(expr $lcms2 : '.*-\([0-9.]\+\)$') - download $lcms2 $lcms2.tar.gz https://sourceforge.net/projects/lcms/files/lcms/$version/$lcms2.tar.gz/down... - (cd $lcms2 && $run_configure && make $makeflags) -} - -config_tiff () -{ - download $tiff https://download.osgeo.org/libtiff/$tiff.zip - cp ../wine/tools/config.sub ../wine/tools/config.guess $tiff/config - (cd $tiff && $run_configure && make $makeflags) -} - -config_xml2 () -{ - download $xml2 ftp://xmlsoft.org/libxml2/$xml2.tar.gz - (cd $xml2 && $run_configure --without-python && make $makeflags libxml2.la) -} - -config_xslt () -{ - test -d $xml2 || config_xml2 - download $xslt ftp://xmlsoft.org/libxml2/$xslt.tar.gz - (cd $xslt && $run_configure --without-python --with-libxml-src=../$xml2 && make $makeflags) + (cd $freetype && $run_configure --without-png && make $makeflags) } config_gmp () @@ -169,17 +119,10 @@ config_gnutls () config_openldap () { download $openldap ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/$openldap.tgz - cp $jpeg/ltmain.sh $jpeg/config.guess $jpeg/config.sub $openldap/build + cp $gnutls/build-aux/ltmain.sh $gnutls/build-aux/config.guess $gnutls/build-aux/config.sub $openldap/build (cd $openldap && aclocal && autoconf && $run_configure --with-yielding_select=yes --disable-bdb --disable-hdb ac_cv_func_memcmp_working=yes CPPFLAGS=-DANDROID CC=$host-gcc && make $makeflags) } -config_mpeg () -{ - version=$(expr $mpeg : '.*-\([0-9.]\+\)$') - download $mpeg $mpeg.tar.bz2 https://sourceforge.net/projects/mpg123/files/mpg123/$version/$mpeg.tar.bz2/... - (cd $mpeg && $run_configure ac_cv_func_mmap_fixed_mapped=yes && make $makeflags) -} - config_cups () { version=v$(expr $cups : '.*-\([0-9.]\+\)$') @@ -197,44 +140,21 @@ config_wine_tools () config_wine () { test -d toolchain || config_toolchain - test -d $png || config_png - test -d $jpeg || config_jpeg test -d $freetype || config_freetype - test -d $lcms2 || config_lcms2 - test -d $tiff || config_tiff - test -d $xml2 || config_xml2 - test -d $xslt || config_xslt test -d $gmp || config_gmp test -d $nettle || config_nettle test -d $gnutls || config_gnutls test -d $openldap || config_openldap - test -d $mpeg || config_mpeg test -d $cups || config_cups rm -rf wine mkdir wine (cd wine && ../../wine/configure $silent --host=$host --with-wine-tools=../../tools CC=$cc \ FREETYPE_CFLAGS="-I../$freetype/include" \ - FREETYPE_LIBS="-L../$freetype/objs/.libs -lfreetype -L../$png/.libs -lpng16" \ - LCMS2_CFLAGS="-I../$lcms2/include" \ - LCMS2_LIBS="-L../$lcms2/src/.libs -llcms2" \ - PNG_CFLAGS="-I../$png" \ - PNG_LIBS="-L../$png/.libs -lpng16" \ - ac_cv_lib_soname_png="libpng16.so" \ - JPEG_CFLAGS="-I../$jpeg" \ - JPEG_LIBS="-L../$jpeg/.libs -ljpeg" \ - ac_cv_lib_soname_jpeg="libwjpeg.so" \ - TIFF_CFLAGS="-I../$tiff/libtiff" \ - TIFF_LIBS="-L../$tiff/libtiff/.libs -ltiff" \ - XML2_CFLAGS="-I../$xml2/include" \ - XML2_LIBS="-L../$xml2/.libs -lxml2" \ - XSLT_CFLAGS="-I../$xml2/include -I../$xslt" \ - XSLT_LIBS="-L../$xslt/libxslt/.libs -L../$xml2/.libs -lxml2" \ + FREETYPE_LIBS="-L../$freetype/objs/.libs -lfreetype" \ GNUTLS_CFLAGS="-I../$gnutls/lib/includes" \ GNUTLS_LIBS="-L../$gnutls/lib/.libs -lgnutls -L../$gmp/.libs -lgmp" \ LDAP_CFLAGS="-I../$openldap/include" \ LDAP_LIBS="-L../$openldap/libraries/liblber/.libs -L../$openldap/libraries/libldap_r/.libs -lldap_r-2.4 -llber-2.4" \ - MPG123_CFLAGS="-I../$mpeg/src/libmpg123" \ - MPG123_LIBS="-L../$mpeg/src/libmpg123/.libs -lmpg123" \ CUPS_CFLAGS="-I../$cups" \ CUPS_LIBS="-L../$cups/cups -lcups -L../$gnutls/lib/.libs -lgnutls -L../$gmp/.libs -lgmp") } @@ -256,18 +176,11 @@ install_all () make $makeflags all install-lib DESTDIR=$(pwd) prefix=/assets-tmp for i in \ - ../$png/.libs/libpng16.so \ - ../$jpeg/.libs/libwjpeg.so \ ../$freetype/objs/.libs/libfreetype.so \ - ../$lcms2/src/.libs/liblcms2.so \ - ../$tiff/libtiff/.libs/libtiff.so \ - ../$xml2/.libs/libxml2.so \ - ../$xslt/libxslt/.libs/libxslt.so \ ../$gmp/.libs/libgmp.so \ ../$gnutls/lib/.libs/libgnutls.so \ ../$openldap/libraries/liblber/.libs/liblber-2.4.so \ ../$openldap/libraries/libldap_r/.libs/libldap_r-2.4.so \ - ../$mpeg/src/libmpg123/.libs/libmpg123.so \ ../$cups/cups/libcups.so do $install -s $i $destdir/lib/$exec_prefix/$(basename $i)
participants (1)
-
Alexandre Julliard