diff --git a/build/lin.sh b/build/lin.sh index 96748787..2ddcacc5 100755 --- a/build/lin.sh +++ b/build/lin.sh @@ -94,7 +94,6 @@ VERSION_ZLIB_NG=2.0.6 VERSION_FFI=3.4.4 VERSION_GLIB=2.75.3 VERSION_XML2=2.10.3 -VERSION_GSF=1.14.50 VERSION_EXIF=0.6.24 VERSION_LCMS2=2.14 VERSION_MOZJPEG=4.1.1 @@ -154,7 +153,6 @@ version_latest "zlib-ng" "$VERSION_ZLIB_NG" "115592" version_latest "ffi" "$VERSION_FFI" "1611" version_latest "glib" "$VERSION_GLIB" "10024" "unstable" version_latest "xml2" "$VERSION_XML2" "1783" -version_latest "gsf" "$VERSION_GSF" "1980" version_latest "exif" "$VERSION_EXIF" "1607" version_latest "lcms2" "$VERSION_LCMS2" "9815" version_latest "mozjpeg" "$VERSION_MOZJPEG" "mozilla/mozjpeg" @@ -233,14 +231,6 @@ cd ${DEPS}/xml2 --with-minimum --with-reader --with-writer --with-valid --with-http --with-tree --with-zlib --without-python --without-lzma make install-strip -mkdir ${DEPS}/gsf -$CURL https://download.gnome.org/sources/libgsf/$(without_patch $VERSION_GSF)/libgsf-${VERSION_GSF}.tar.xz | tar xJC ${DEPS}/gsf --strip-components=1 -cd ${DEPS}/gsf -./configure --host=${CHOST} --prefix=${TARGET} --enable-static --disable-shared --disable-dependency-tracking \ - --without-bz2 --without-gdk-pixbuf --disable-nls --without-libiconv-prefix --without-libintl-prefix -# Skip unused subdirs -make install-strip SUBDIRS="gsf" - mkdir ${DEPS}/exif $CURL https://github.com/libexif/libexif/releases/download/v${VERSION_EXIF}/libexif-${VERSION_EXIF}.tar.bz2 | tar xjC ${DEPS}/exif --strip-components=1 cd ${DEPS}/exif @@ -416,7 +406,7 @@ mkdir ${DEPS}/svg $CURL https://download.gnome.org/sources/librsvg/$(without_patch $VERSION_SVG)/librsvg-${VERSION_SVG}.tar.xz | tar xJC ${DEPS}/svg --strip-components=1 cd ${DEPS}/svg # Add missing pkg-config deps -sed -i'.bak' "s/^\(Requires:.*\)/\1 cairo-gobject pangocairo/" librsvg.pc.in +sed -i'.bak' "s/^\(Requires:.*\)/\1 cairo-gobject pangocairo libxml-2.0/" librsvg.pc.in # LTO optimization does not work for staticlib+rlib compilation sed -i'.bak' "s/, \"rlib\"//" Cargo.toml # Remove the --static flag from the PKG_CONFIG env since Rust does not @@ -458,7 +448,8 @@ sed -i'.bak' "/subdir('man')/{N;N;N;N;d;}" meson.build CFLAGS="${CFLAGS} -O3" CXXFLAGS="${CXXFLAGS} -O3" meson setup _build --default-library=shared --buildtype=release --strip --prefix=${TARGET} ${MESON} \ -Ddeprecated=false -Dintrospection=false -Dmodules=disabled -Dcfitsio=disabled -Dfftw=disabled -Djpeg-xl=disabled \ -Dmagick=disabled -Dmatio=disabled -Dnifti=disabled -Dopenexr=disabled -Dopenjpeg=disabled -Dopenslide=disabled \ - -Dpdfium=disabled -Dpoppler=disabled -Dquantizr=disabled -Dppm=false -Danalyze=false -Dradiance=false \ + -Dpdfium=disabled -Dpoppler=disabled -Dquantizr=disabled -Dgsf=disabled \ + -Dppm=false -Danalyze=false -Dradiance=false \ ${LINUX:+-Dcpp_link_args="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--version-script=$DEPS/vips/vips.map $EXCLUDE_LIBS"} meson install -C _build --tag runtime,devel @@ -524,7 +515,6 @@ printf "{\n\ \"fribidi\": \"${VERSION_FRIBIDI}\",\n\ \"gdkpixbuf\": \"${VERSION_GDKPIXBUF}\",\n\ \"glib\": \"${VERSION_GLIB}\",\n\ - \"gsf\": \"${VERSION_GSF}\",\n\ \"harfbuzz\": \"${VERSION_HARFBUZZ}\",\n\ \"heif\": \"${VERSION_HEIF}\",\n\ \"imagequant\": \"${VERSION_IMAGEQUANT}\",\n\