rsvg-again

Author: wader

Dockerfile

@@ -8,6 +8,7 @@ ARG APK_OPTS=""
 
 RUN apk add --no-cache $APK_OPTS \
   coreutils \
+  mold \
   pkgconfig \
   wget \
   rust cargo cargo-c \
@@ -166,28 +167,28 @@ RUN \
     -Dgtk_doc=false && \
   ninja -j$(nproc) -vC build install
 
-# # bump: librsvg /LIBRSVG_VERSION=([\d.]+)/ https://gitlab.gnome.org/GNOME/librsvg.git|^2
-# # bump: librsvg after ./hashupdate Dockerfile LIBRSVG $LATEST
-# # bump: librsvg link "NEWS" https://gitlab.gnome.org/GNOME/librsvg/-/blob/master/NEWS
-# ARG LIBRSVG_VERSION=2.60.0
-# ARG LIBRSVG_URL="https://download.gnome.org/sources/librsvg/2.60/librsvg-$LIBRSVG_VERSION.tar.xz"
-# ARG LIBRSVG_SHA256=0b6ffccdf6e70afc9876882f5d2ce9ffcf2c713cbaaf1ad90170daa752e1eec3
-# RUN \
-#   wget $WGET_OPTS -O librsvg.tar.xz "$LIBRSVG_URL" && \
-#   echo "$LIBRSVG_SHA256  librsvg.tar.xz" | sha256sum --status -c - && \
-#   tar $TAR_OPTS librsvg.tar.xz && cd librsvg-* && \
-#   # workaround for https://gitlab.gnome.org/GNOME/librsvg/-/issues/1158
-#   sed -i "/^if host_system in \['windows'/s/, 'linux'//" meson.build && \
-#   meson setup build \
-#     -Dbuildtype=release \
-#     -Ddefault_library=static \
-#     -Ddocs=disabled \
-#     -Dintrospection=disabled \
-#     -Dpixbuf=disabled \
-#     -Dpixbuf-loader=disabled \
-#     -Dvala=disabled \
-#     -Dtests=false && \
-#   ninja -j$(nproc) -vC build install
+# bump: librsvg /LIBRSVG_VERSION=([\d.]+)/ https://gitlab.gnome.org/GNOME/librsvg.git|^2
+# bump: librsvg after ./hashupdate Dockerfile LIBRSVG $LATEST
+# bump: librsvg link "NEWS" https://gitlab.gnome.org/GNOME/librsvg/-/blob/master/NEWS
+ARG LIBRSVG_VERSION=2.60.0
+ARG LIBRSVG_URL="https://download.gnome.org/sources/librsvg/2.60/librsvg-$LIBRSVG_VERSION.tar.xz"
+ARG LIBRSVG_SHA256=0b6ffccdf6e70afc9876882f5d2ce9ffcf2c713cbaaf1ad90170daa752e1eec3
+RUN \
+  wget $WGET_OPTS -O librsvg.tar.xz "$LIBRSVG_URL" && \
+  echo "$LIBRSVG_SHA256  librsvg.tar.xz" | sha256sum --status -c - && \
+  tar $TAR_OPTS librsvg.tar.xz && cd librsvg-* && \
+  # workaround for https://gitlab.gnome.org/GNOME/librsvg/-/issues/1158
+  sed -i "/^if host_system in \['windows'/s/, 'linux'//" meson.build && \
+  meson setup build \
+    -Dbuildtype=release \
+    -Ddefault_library=static \
+    -Ddocs=disabled \
+    -Dintrospection=disabled \
+    -Dpixbuf=disabled \
+    -Dpixbuf-loader=disabled \
+    -Dvala=disabled \
+    -Dtests=false && \
+  ninja -j$(nproc) -vC build install
 
 # build after libvmaf
 # bump: aom /AOM_VERSION=([\d.]+)/ git:https://aomedia.googlesource.com/aom|*
@@ -1142,7 +1143,7 @@ RUN \
   ./configure \
   --pkg-config-flags="--static" \
   --extra-cflags="-fopenmp" \
-  --extra-ldflags="-fopenmp -Wl,--allow-multiple-definition -Wl,-z,stack-size=2097152" \
+  --extra-ldflags="-fuse-ld=mold -fopenmp -Wl,--allow-multiple-definition -Wl,-z,stack-size=2097152" \
   --toolchain=hardened \
   --disable-debug \
   --disable-shared \
@@ -1177,7 +1178,7 @@ RUN \
   --enable-libopus \
   --enable-librabbitmq \
   --enable-librav1e \
-  # --enable-librsvg \
+  --enable-librsvg \
   --enable-librtmp \
   --enable-librubberband \
   --enable-libshine \
@@ -1253,7 +1254,7 @@ RUN \
   libopus: env.OPUS_VERSION, \
   librabbitmq: env.LIBRABBITMQ_VERSION, \
   librav1e: env.RAV1E_VERSION, \
-  # librsvg: env.LIBRSVG_VERSION, \
+  librsvg: env.LIBRSVG_VERSION, \
   librtmp: env.LIBRTMP_COMMIT, \
   librubberband: env.RUBBERBAND_VERSION, \
   libsamplerate: env.LIBSAMPLERATE_VERSION, \
@@ -1323,7 +1324,7 @@ RUN ["/ffprobe", "-i", "https://github.com/favicon.ico"]
 # tls/https certs
 RUN ["/ffprobe", "-tls_verify", "1", "-ca_file", "/etc/ssl/cert.pem", "-i", "https://github.com/favicon.ico"]
 # svg
-# RUN ["/ffprobe", "-i", "https://github.githubassets.com/favicons/favicon.svg"]
+RUN ["/ffprobe", "-i", "https://github.githubassets.com/favicons/favicon.svg"]
 # vvenc
 RUN ["/ffmpeg", "-f", "lavfi", "-i", "testsrc", "-c:v", "libvvenc", "-t", "100ms", "-f", "null", "-"]
 # x265 regression