mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-22 09:41:07 +00:00
ci: Build glib subproject fallback for clang builds
We currently have glib 2.68 in the image, which produces a couple of warning around g_atomic_ apis. This has since been fixed/worked around in glib itself [1] [2] [3]. Build the subproject until we update to a toolchain/ci-image with new enough glib. [1] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2114 [2] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2578 [3] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2864 Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1060>
This commit is contained in:
parent
eeb77ddca5
commit
118841cc49
1 changed files with 16 additions and 2 deletions
|
@ -403,6 +403,9 @@ build fedora clang:
|
||||||
matrix:
|
matrix:
|
||||||
- BUILD_TYPE: [ "--default-library=shared", "--default-library=both"]
|
- BUILD_TYPE: [ "--default-library=shared", "--default-library=both"]
|
||||||
BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=true"]
|
BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=true"]
|
||||||
|
MESON_ARGS: >-
|
||||||
|
${SIMPLE_BUILD}
|
||||||
|
--force-fallback-for=glib
|
||||||
|
|
||||||
- BUILD_TYPE: [ "--default-library=shared", "--default-library=both"]
|
- BUILD_TYPE: [ "--default-library=shared", "--default-library=both"]
|
||||||
BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=false"]
|
BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=false"]
|
||||||
|
@ -414,7 +417,10 @@ build fedora clang:
|
||||||
# ../subprojects/gstreamer/gst/gstchildproxy.h:57: Error: Gst: identifier not found on the first line:
|
# ../subprojects/gstreamer/gst/gstchildproxy.h:57: Error: Gst: identifier not found on the first line:
|
||||||
# * GstChildProxyInterface.get_child_by_name:
|
# * GstChildProxyInterface.get_child_by_name:
|
||||||
# ^
|
# ^
|
||||||
MESON_ARGS: "${SIMPLE_BUILD} -Dintrospection=disabled"
|
MESON_ARGS: >-
|
||||||
|
${SIMPLE_BUILD}
|
||||||
|
-Dintrospection=disabled
|
||||||
|
--force-fallback-for=glib
|
||||||
|
|
||||||
- BUILD_TYPE: ["--default-library=static"]
|
- BUILD_TYPE: ["--default-library=static"]
|
||||||
BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=true", "-Dgstreamer:gst_debug=false"]
|
BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=true", "-Dgstreamer:gst_debug=false"]
|
||||||
|
@ -430,7 +436,15 @@ build fedora clang:
|
||||||
#
|
#
|
||||||
# Disabling gstreamer-sharp tests because they download things as part of configure with
|
# Disabling gstreamer-sharp tests because they download things as part of configure with
|
||||||
# nuget which frequently fails on the CI (possibly because we're hammering the site)
|
# nuget which frequently fails on the CI (possibly because we're hammering the site)
|
||||||
MESON_ARGS: "${DEFAULT_MESON_ARGS} -Dvaapi=disabled -Dpython=auto -Dgst-editing-services:python=disabled -Dintrospection=disabled -Ddoc=disabled -Dgstreamer-sharp:tests=disabled"
|
MESON_ARGS: >-
|
||||||
|
${DEFAULT_MESON_ARGS}
|
||||||
|
-Dvaapi=disabled
|
||||||
|
-Dpython=auto
|
||||||
|
-Dgst-editing-services:python=disabled
|
||||||
|
-Dintrospection=disabled
|
||||||
|
-Ddoc=disabled
|
||||||
|
-Dgstreamer-sharp:tests=disabled
|
||||||
|
--force-fallback-for=glib
|
||||||
|
|
||||||
.build windows:
|
.build windows:
|
||||||
image: $WINDOWS_IMAGE
|
image: $WINDOWS_IMAGE
|
||||||
|
|
Loading…
Reference in a new issue