Skip to content

Commit 85c0140

Browse files
waderwader
committed
Disable librsvg for now
1 parent 7457f69 commit 85c0140

File tree

1 file changed

+79
-79
lines changed

1 file changed

+79
-79
lines changed

‎Dockerfile‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -94,22 +94,22 @@ RUN \
9494
# extra libs stdc++ is for vmaf https://github.com/Netflix/vmaf/issues/788
9595
RUN sed -i 's/-lvmaf /-lvmaf -lstdc++ /' /usr/local/lib/pkgconfig/libvmaf.pc
9696

97-
# own build as alpine glib links with libmount etc
98-
# bump: glib /GLIB_VERSION=([\d.]+)/ https://gitlab.gnome.org/GNOME/glib.git|^2
99-
# bump: glib after ./hashupdate Dockerfile GLIB $LATEST
100-
# bump: glib link "NEWS" https://gitlab.gnome.org/GNOME/glib/-/blob/main/NEWS?ref_type=heads
101-
ARG GLIB_VERSION=2.84.1
102-
ARG GLIB_URL="https://download.gnome.org/sources/glib/2.84/glib-$GLIB_VERSION.tar.xz"
103-
ARG GLIB_SHA256=2b4bc2ec49611a5fc35f86aca855f2ed0196e69e53092bab6bb73396bf30789a
104-
RUN \
105-
wget $WGET_OPTS -O glib.tar.xz "$GLIB_URL" && \
106-
echo "$GLIB_SHA256 glib.tar.xz" | sha256sum --status -c - && \
107-
tar $TAR_OPTS glib.tar.xz && cd glib-* && \
108-
meson setup build \
109-
-Dbuildtype=release \
110-
-Ddefault_library=static \
111-
-Dlibmount=disabled && \
112-
ninja -j$(nproc) -vC build install
97+
# # own build as alpine glib links with libmount etc
98+
# # bump: glib /GLIB_VERSION=([\d.]+)/ https://gitlab.gnome.org/GNOME/glib.git|^2
99+
# # bump: glib after ./hashupdate Dockerfile GLIB $LATEST
100+
# # bump: glib link "NEWS" https://gitlab.gnome.org/GNOME/glib/-/blob/main/NEWS?ref_type=heads
101+
# ARG GLIB_VERSION=2.84.1
102+
# ARG GLIB_URL="https://download.gnome.org/sources/glib/2.84/glib-$GLIB_VERSION.tar.xz"
103+
# ARG GLIB_SHA256=2b4bc2ec49611a5fc35f86aca855f2ed0196e69e53092bab6bb73396bf30789a
104+
# RUN \
105+
# wget $WGET_OPTS -O glib.tar.xz "$GLIB_URL" && \
106+
# echo "$GLIB_SHA256 glib.tar.xz" | sha256sum --status -c - && \
107+
# tar $TAR_OPTS glib.tar.xz && cd glib-* && \
108+
# meson setup build \
109+
# -Dbuildtype=release \
110+
# -Ddefault_library=static \
111+
# -Dlibmount=disabled && \
112+
# ninja -j$(nproc) -vC build install
113113

114114
# bump: harfbuzz /LIBHARFBUZZ_VERSION=([\d.]+)/ https://github.com/harfbuzz/harfbuzz.git|*
115115
# bump: harfbuzz after ./hashupdate Dockerfile LIBHARFBUZZ $LATEST
@@ -126,68 +126,68 @@ RUN \
126126
-Ddefault_library=static && \
127127
ninja -j$(nproc) -vC build install
128128

129-
# bump: cairo /CAIRO_VERSION=([\d.]+)/ https://gitlab.freedesktop.org/cairo/cairo.git|^1
130-
# bump: cairo after ./hashupdate Dockerfile CAIRO $LATEST
131-
# bump: cairo link "NEWS" https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/NEWS?ref_type=heads
132-
ARG CAIRO_VERSION=1.18.4
133-
ARG CAIRO_URL="https://cairographics.org/releases/cairo-$CAIRO_VERSION.tar.xz"
134-
ARG CAIRO_SHA256=445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb
135-
RUN \
136-
wget $WGET_OPTS -O cairo.tar.xz "$CAIRO_URL" && \
137-
echo "$CAIRO_SHA256 cairo.tar.xz" | sha256sum --status -c - && \
138-
tar $TAR_OPTS cairo.tar.xz && cd cairo-* && \
139-
meson setup build \
140-
-Dbuildtype=release \
141-
-Ddefault_library=static \
142-
-Dtests=disabled \
143-
-Dquartz=disabled \
144-
-Dxcb=disabled \
145-
-Dxlib=disabled \
146-
-Dxlib-xcb=disabled && \
147-
ninja -j$(nproc) -vC build install
148-
149-
# TODO: there is weird "1.90" tag, skip it
150-
# bump: pango /PANGO_VERSION=([\d.]+)/ https://github.com/GNOME/pango.git|/\d+\.\d+\.\d+/|*
151-
# bump: pango after ./hashupdate Dockerfile PANGO $LATEST
152-
# bump: pango link "NEWS" https://gitlab.gnome.org/GNOME/pango/-/blob/main/NEWS?ref_type=heads
153-
ARG PANGO_VERSION=1.56.4
154-
ARG PANGO_URL="https://download.gnome.org/sources/pango/1.56/pango-$PANGO_VERSION.tar.xz"
155-
ARG PANGO_SHA256=17065e2fcc5f5a5bdbffc884c956bfc7c451a96e8c4fb2f8ad837c6413cb5a01
156-
# TODO: add -Dbuild-testsuite=false when in stable release
157-
# TODO: -Ddefault_library=both currently to not fail building tests
158-
RUN \
159-
wget $WGET_OPTS -O pango.tar.xz "$PANGO_URL" && \
160-
echo "$PANGO_SHA256 pango.tar.xz" | sha256sum --status -c - && \
161-
tar $TAR_OPTS pango.tar.xz && cd pango-* && \
162-
meson setup build \
163-
-Dbuildtype=release \
164-
-Ddefault_library=both \
165-
-Dintrospection=disabled \
166-
-Dgtk_doc=false && \
167-
ninja -j$(nproc) -vC build install
168-
169-
# bump: librsvg /LIBRSVG_VERSION=([\d.]+)/ https://gitlab.gnome.org/GNOME/librsvg.git|^2
170-
# bump: librsvg after ./hashupdate Dockerfile LIBRSVG $LATEST
171-
# bump: librsvg link "NEWS" https://gitlab.gnome.org/GNOME/librsvg/-/blob/master/NEWS
172-
ARG LIBRSVG_VERSION=2.60.0
173-
ARG LIBRSVG_URL="https://download.gnome.org/sources/librsvg/2.60/librsvg-$LIBRSVG_VERSION.tar.xz"
174-
ARG LIBRSVG_SHA256=0b6ffccdf6e70afc9876882f5d2ce9ffcf2c713cbaaf1ad90170daa752e1eec3
175-
RUN \
176-
wget $WGET_OPTS -O librsvg.tar.xz "$LIBRSVG_URL" && \
177-
echo "$LIBRSVG_SHA256 librsvg.tar.xz" | sha256sum --status -c - && \
178-
tar $TAR_OPTS librsvg.tar.xz && cd librsvg-* && \
179-
# workaround for https://gitlab.gnome.org/GNOME/librsvg/-/issues/1158
180-
sed -i "/^if host_system in \['windows'/s/, 'linux'//" meson.build && \
181-
meson setup build \
182-
-Dbuildtype=release \
183-
-Ddefault_library=static \
184-
-Ddocs=disabled \
185-
-Dintrospection=disabled \
186-
-Dpixbuf=disabled \
187-
-Dpixbuf-loader=disabled \
188-
-Dvala=disabled \
189-
-Dtests=false && \
190-
ninja -j$(nproc) -vC build install
129+
# # bump: cairo /CAIRO_VERSION=([\d.]+)/ https://gitlab.freedesktop.org/cairo/cairo.git|^1
130+
# # bump: cairo after ./hashupdate Dockerfile CAIRO $LATEST
131+
# # bump: cairo link "NEWS" https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/NEWS?ref_type=heads
132+
# ARG CAIRO_VERSION=1.18.4
133+
# ARG CAIRO_URL="https://cairographics.org/releases/cairo-$CAIRO_VERSION.tar.xz"
134+
# ARG CAIRO_SHA256=445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb
135+
# RUN \
136+
# wget $WGET_OPTS -O cairo.tar.xz "$CAIRO_URL" && \
137+
# echo "$CAIRO_SHA256 cairo.tar.xz" | sha256sum --status -c - && \
138+
# tar $TAR_OPTS cairo.tar.xz && cd cairo-* && \
139+
# meson setup build \
140+
# -Dbuildtype=release \
141+
# -Ddefault_library=static \
142+
# -Dtests=disabled \
143+
# -Dquartz=disabled \
144+
# -Dxcb=disabled \
145+
# -Dxlib=disabled \
146+
# -Dxlib-xcb=disabled && \
147+
# ninja -j$(nproc) -vC build install
148+
149+
# # TODO: there is weird "1.90" tag, skip it
150+
# # bump: pango /PANGO_VERSION=([\d.]+)/ https://github.com/GNOME/pango.git|/\d+\.\d+\.\d+/|*
151+
# # bump: pango after ./hashupdate Dockerfile PANGO $LATEST
152+
# # bump: pango link "NEWS" https://gitlab.gnome.org/GNOME/pango/-/blob/main/NEWS?ref_type=heads
153+
# ARG PANGO_VERSION=1.56.4
154+
# ARG PANGO_URL="https://download.gnome.org/sources/pango/1.56/pango-$PANGO_VERSION.tar.xz"
155+
# ARG PANGO_SHA256=17065e2fcc5f5a5bdbffc884c956bfc7c451a96e8c4fb2f8ad837c6413cb5a01
156+
# # TODO: add -Dbuild-testsuite=false when in stable release
157+
# # TODO: -Ddefault_library=both currently to not fail building tests
158+
# RUN \
159+
# wget $WGET_OPTS -O pango.tar.xz "$PANGO_URL" && \
160+
# echo "$PANGO_SHA256 pango.tar.xz" | sha256sum --status -c - && \
161+
# tar $TAR_OPTS pango.tar.xz && cd pango-* && \
162+
# meson setup build \
163+
# -Dbuildtype=release \
164+
# -Ddefault_library=both \
165+
# -Dintrospection=disabled \
166+
# -Dgtk_doc=false && \
167+
# ninja -j$(nproc) -vC build install
168+
169+
# # bump: librsvg /LIBRSVG_VERSION=([\d.]+)/ https://gitlab.gnome.org/GNOME/librsvg.git|^2
170+
# # bump: librsvg after ./hashupdate Dockerfile LIBRSVG $LATEST
171+
# # bump: librsvg link "NEWS" https://gitlab.gnome.org/GNOME/librsvg/-/blob/master/NEWS
172+
# ARG LIBRSVG_VERSION=2.60.0
173+
# ARG LIBRSVG_URL="https://download.gnome.org/sources/librsvg/2.60/librsvg-$LIBRSVG_VERSION.tar.xz"
174+
# ARG LIBRSVG_SHA256=0b6ffccdf6e70afc9876882f5d2ce9ffcf2c713cbaaf1ad90170daa752e1eec3
175+
# RUN \
176+
# wget $WGET_OPTS -O librsvg.tar.xz "$LIBRSVG_URL" && \
177+
# echo "$LIBRSVG_SHA256 librsvg.tar.xz" | sha256sum --status -c - && \
178+
# tar $TAR_OPTS librsvg.tar.xz && cd librsvg-* && \
179+
# # workaround for https://gitlab.gnome.org/GNOME/librsvg/-/issues/1158
180+
# sed -i "/^if host_system in \['windows'/s/, 'linux'//" meson.build && \
181+
# meson setup build \
182+
# -Dbuildtype=release \
183+
# -Ddefault_library=static \
184+
# -Ddocs=disabled \
185+
# -Dintrospection=disabled \
186+
# -Dpixbuf=disabled \
187+
# -Dpixbuf-loader=disabled \
188+
# -Dvala=disabled \
189+
# -Dtests=false && \
190+
# ninja -j$(nproc) -vC build install
191191

192192
# build after libvmaf
193193
# bump: aom /AOM_VERSION=([\d.]+)/ git:https://aomedia.googlesource.com/aom|*
@@ -1168,7 +1168,7 @@ RUN \
11681168
--enable-libopus \
11691169
--enable-librabbitmq \
11701170
--enable-librav1e \
1171-
--enable-librsvg \
1171+
# --enable-librsvg \
11721172
--enable-librtmp \
11731173
--enable-librubberband \
11741174
--enable-libshine \

0 commit comments

Comments
 (0)