Update deps; remove gdk-pixbif

Author: DarthSim

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [3.12.0] - 2024-10-24
+### Changed
+- Update Go to 1.23.2.
+- Update zlib to 2.2.2.
+- Update GLib to 2.82.2.
+- Update libexpat to 2.6.3.
+- Update libxml2 to 2.13.4.
+- Update libjpegturbo to 3.0.4.
+- Update libtiff to 4.7.0.
+- Update dav1d to 1.5.0.
+- Update aom to 3.10.0.
+- Update harfbuzz to 10.0.1.
+- Update cairo to 1.18.2.
+- Update fribidi to 1.0.16.
+- Update librsvg to 2.59.1.
+- Update vips to 8.15.5.
+
+### Removed
+- Remove gdkpixbuf.
+
 ## [3.11.0] - 2024-08-13
 ### Change
 - Change base image to `debian:bullseye` for glibc compatibility.

build-bash-profile.sh

@@ -48,7 +48,7 @@ export STRIP=$ARCH-linux-gnu-strip
 export CFLAGS="\$CFLAGS -Os -fPIC -D_GLIBCXX_USE_CXX11_ABI=1 -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections"
 export CXXFLAGS=\$CFLAGS
 export CPPFLAGS="\$CPPFLAGS -I/opt/imgproxy/include"
-export LDFLAGS="\$LDFLAGS -L/opt/imgproxy/lib -Wl,-rpath,/opt/imgproxy/lib"
+export LDFLAGS="\$LDFLAGS -L/opt/imgproxy/lib -Wl,--gc-sections -Wl,-rpath,/opt/imgproxy/lib"
 export CMAKE_C_COMPILER=\$CC
 export CMAKE_CXX_COMPILER=\$CXX
 export CMAKE_CROSS_CONFIG="-DCMAKE_TOOLCHAIN_FILE=/root/cmake_$TARGETARCH.cmake"

build-deps.sh

@@ -55,6 +55,8 @@ make install-strip -j$(nproc)
 
 print_build_stage glib $GLIB_VERSION
 cd $DEPS_SRC/glib
+# Build GLib without gregex
+curl -Ls https://gist.githubusercontent.com/kleisauke/284d685efa00908da99ea6afbaaf39ae/raw/36e32c79e7962c5ea96cbb3f9c629e9145253e30/glib-without-gregex.patch | patch -p1
 meson setup _build \
   --buildtype=release \
   --strip \
@@ -63,7 +65,12 @@ meson setup _build \
   ${MESON_CROSS_CONFIG} \
   -Dlibmount=disabled \
   -Dtests=false \
-  -Dinstalled_tests=false
+  -Dintrospection=disabled \
+  -Dnls=disabled \
+  -Dsysprof=disabled \
+  -Dlibelf=disabled \
+  -Dinstalled_tests=false \
+  -Dglib_debug=disabled
 ninja -C _build
 ninja -C _build install
 
@@ -334,24 +341,6 @@ cmake \
   ..
 ninja install/strip
 
-print_build_stage gdk-pixbuf $GDKPIXBUF_VERSION
-cd $DEPS_SRC/gdk-pixbuf
-meson setup _build \
-  --buildtype=release \
-  --strip \
-  --prefix=$TARGET_PATH \
-  --libdir=lib \
-  ${MESON_CROSS_CONFIG} \
-  -Dintrospection=disabled \
-  -Dinstalled_tests=false \
-  -Dgio_sniffing=false \
-  -Dman=false \
-  -Dtiff=disabled \
-  -Dbuiltin_loaders=png,jpeg,gif
-ninja -C _build
-ninja -C _build install
-rm -rf $TARGET_PATH/lib/gdk-pixbuf-2.0
-
 print_build_stage freetype $FREETYPE_VERSION
 cd $DEPS_SRC/freetype
 meson setup _build \
@@ -421,7 +410,9 @@ meson setup _build \
   --strip \
   --prefix=$TARGET_PATH \
   --libdir=lib \
+  -Dfontconfig=enabled \
   -Dquartz=disabled \
+  -Dtee=disabled \
   -Dxcb=disabled \
   -Dxlib=disabled \
   -Dzlib=disabled \
@@ -460,26 +451,28 @@ ninja -C _build install
 
 print_build_stage librsvg $LIBRSVG_VERSION
 cd $DEPS_SRC/librsvg
-sed -i'.bak' "s/^\(Requires:.*\)/\1 cairo-gobject pangocairo/" librsvg.pc.in
-# LTO optimization does not work for staticlib+rlib compilation
-sed -i'.bak' "s/, \"rlib\"//" Cargo.toml
+# Remove pdf and ps support
+sed -i'.bak' "/cairo-rs = /s/, \"pdf\", \"ps\"//" {librsvg-c,rsvg}/Cargo.toml
 # Skip executables
-sed -i'.bak' "/SCRIPTS = /d" Makefile.in
-RUST_TARGET=$CARGO_TARGET \
-./configure \
-  --build=$BUILD \
-  --host=$HOST \
+sed -i'.bak' "/subdir('rsvg_convert')/d" meson.build
+# For some reason, librsvg fails to build without -ldl
+CFLAGS="${CFLAGS} -ldl" CXXFLAGS="${CXXFLAGS} -ldl" \
+LDFLAGS="${LDFLAGS} -ldl" \
+meson setup _build \
+  --buildtype=release \
+  --strip \
   --prefix=$TARGET_PATH \
-  --enable-shared \
-  --disable-static \
-  --disable-dependency-tracking \
-  --disable-introspection \
-  --disable-tools \
-  --disable-pixbuf-loader \
-  --disable-nls \
-  --without-libiconv-prefix \
-  --without-libintl-prefix
-make install-strip -j$(nproc)
+  --libdir=lib \
+  -Dtriplet=$CARGO_TARGET \
+  -Dintrospection=disabled \
+  -Dpixbuf{,-loader}=disabled \
+  -Ddocs=disabled \
+  -Dvala=disabled \
+  -Dtests=false \
+  -Davif=enabled \
+  ${MESON_CROSS_CONFIG}
+ninja -C _build
+ninja -C _build install
 
 print_build_stage vips $VIPS_VERSION
 cd $DEPS_SRC/vips

check-versions.sh

@@ -60,7 +60,6 @@ check_version "DAV1D" $DAV1D_VERSION "18920"
 # check_version "RAV1E" $RAV1E_VERSION "75048"
 check_version "AOM" $AOM_VERSION "17628"
 check_version "LIBHEIF" $LIBHEIF_VERSION "64439"
-check_version "GDKPIXBUF" $GDKPIXBUF_VERSION "9533"
 check_version "FREETYPE" $FREETYPE_VERSION "854"
 check_version "FONTCONFIG" $FONTCONFIG_VERSION "827"
 check_version "HARFBUZZ" $HARFBUZZ_VERSION "1299"

download-deps.sh

@@ -73,7 +73,7 @@ curl -Ls https://github.com/libexif/libexif/archive/libexif-$(snake_version $LIB
 print_download_stage lcms2 $LCMS2_VERSION
 mkdir $DEPS_SRC/lcms2
 cd $DEPS_SRC/lcms2
-curl -Ls https://sourceforge.net/projects/lcms/files/lcms/$(minor_version $LCMS2_VERSION)/lcms2-$LCMS2_VERSION.tar.gz/download \
+curl -Ls https://github.com/mm2/Little-CMS/releases/download/lcms${LCMS2_VERSION}/lcms2-${LCMS2_VERSION}.tar.gz \
   | tar -xzC . --strip-components=1
 
 print_download_stage libjpeg-turbo $LIBJPEGTURBO_VERSION
@@ -154,12 +154,6 @@ cd $DEPS_SRC/libheif
 curl -Ls https://github.com/strukturag/libheif/releases/download/v$LIBHEIF_VERSION/libheif-$LIBHEIF_VERSION.tar.gz \
   | tar -xzC . --strip-components=1
 
-print_download_stage gdk-pixbuf $GDKPIXBUF_VERSION
-mkdir $DEPS_SRC/gdk-pixbuf
-cd $DEPS_SRC/gdk-pixbuf
-curl -Lks https://download.gnome.org/sources/gdk-pixbuf/$(minor_version $GDKPIXBUF_VERSION)/gdk-pixbuf-${GDKPIXBUF_VERSION}.tar.xz \
-  | tar -xJC . --strip-components=1
-
 print_download_stage freetype $FREETYPE_VERSION
 mkdir $DEPS_SRC/freetype
 cd $DEPS_SRC/freetype

meson_amd64.ini

@@ -11,5 +11,8 @@ ar = '/usr/bin/x86_64-linux-gnu-gcc-ar'
 nm = '/usr/bin/x86_64-linux-gnu-gcc-nm'
 ld = '/usr/bin/x86_64-linux-gnu-ld'
 strip = '/usr/bin/x86_64-linux-gnu-strip'
-pkgconfig = '/usr/bin/pkg-config'
+pkg-config = '/usr/bin/pkg-config'
 ranlib = '/usr/bin/x86_64-linux-gnu-gcc-ranlib'
+
+[built-in options]
+wrap_mode = 'nofallback'

meson_arm64.ini

@@ -11,5 +11,8 @@ ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'
 nm = '/usr/bin/aarch64-linux-gnu-gcc-nm'
 ld = '/usr/bin/aarch64-linux-gnu-ld'
 strip = '/usr/bin/aarch64-linux-gnu-strip'
-pkgconfig = '/usr/bin/pkg-config'
+pkg-config = '/usr/bin/pkg-config'
 ranlib = '/usr/bin/aarch64-linux-gnu-gcc-ranlib'
+
+[built-in options]
+wrap_mode = 'nofallback'

versions.sh

@@ -1,33 +1,32 @@
-export GOLANG_VERSION=1.22.6
-export ZLIB_VERSION=2.2.1
+export GOLANG_VERSION=1.23.2
+export ZLIB_VERSION=2.2.2
 export FFI_VERSION=3.4.6
-export GLIB_VERSION=2.81.1
+export GLIB_VERSION=2.82.2
 export HIGHWAY_VERSION=1.2.0
 export QUANTIZR_VERSION=1.4.2
-export LIBEXPAT_VERSION=2.6.2
-export LIBXML2_VERSION=2.13.3
+export LIBEXPAT_VERSION=2.6.3
+export LIBXML2_VERSION=2.13.4
 export LIBEXIF_VERSION=0.6.24
 export LCMS2_VERSION=2.16
-export LIBJPEGTURBO_VERSION=3.0.3
+export LIBJPEGTURBO_VERSION=3.0.4
 export LIBPNG_VERSION=1.6.37
 export LIBSPNG_VERSION=0.7.4
 export LIBWEBP_VERSION=1.4.0
-export LIBTIFF_VERSION=4.6.0
+export LIBTIFF_VERSION=4.7.0
 export CGIF_VERSION=0.4.1
 export LIBDE265_VERSION=1.0.15
 export KVAZAAR_VERSION=2.3.1
-export DAV1D_VERSION=1.4.3
+export DAV1D_VERSION=1.5.0
 # export RAV1E_VERSION=0.5.1
-export AOM_VERSION=3.9.1
+export AOM_VERSION=3.10.0
 export LIBYUV_SHA='a6a2ec65'
 export LIBHEIF_VERSION=1.18.2
-export GDKPIXBUF_VERSION=2.42.12
 export FREETYPE_VERSION=2.13.3
 export FONTCONFIG_VERSION=2.15.0
-export HARFBUZZ_VERSION=9.0.0
+export HARFBUZZ_VERSION=10.0.1
 export PIXMAN_VERSION=0.43.4
-export CAIRO_VERSION=1.18.0
-export FRIBIDI_VERSION=1.0.15
+export CAIRO_VERSION=1.18.2
+export FRIBIDI_VERSION=1.0.16
 export PANGO_VERSION=1.54.0
-export LIBRSVG_VERSION=2.58.1
-export VIPS_VERSION=8.15.3
+export LIBRSVG_VERSION=2.59.1
+export VIPS_VERSION=8.15.5