Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
bb42afbd
by Tim-Philipp Müller at 2021-03-07T17:54:21+01:00
-
e2229328
by Tim-Philipp Müller at 2021-03-07T18:01:31+01:00
5 changed files:
Changes:
| 1 |
+stages:
|
|
| 2 |
+ - build
|
|
| 3 |
+ |
|
| 4 |
+# FIXME: Use --werror once warnings are fixed.
|
|
| 5 |
+variables:
|
|
| 6 |
+ MESON_ARGS: --fatal-meson-warnings
|
|
| 7 |
+ MESON_ARGS_WINDOWS: ${MESON_ARGS} --force-fallback-for="">
|
|
| 8 |
+ |
|
| 9 |
+.build meson windows:
|
|
| 10 |
+ # See
|
|
| 11 |
+ # https://gitlab.freedesktop.org/gstreamer/gst-ci/container_registry/213
|
|
| 12 |
+ image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v14-master'
|
|
| 13 |
+ stage: 'build'
|
|
| 14 |
+ tags:
|
|
| 15 |
+ - 'docker'
|
|
| 16 |
+ - 'windows'
|
|
| 17 |
+ - '1809'
|
|
| 18 |
+ - 'gstreamer-windows'
|
|
| 19 |
+ variables:
|
|
| 20 |
+ # Make sure any failure in PowerShell scripts is fatal.
|
|
| 21 |
+ ErrorActionPreference: 'Stop'
|
|
| 22 |
+ WarningPreference: 'Stop'
|
|
| 23 |
+ # Uncomment the following key if need to pass custom args, as well with
|
|
| 24 |
+ # the `$env:MESON_ARGS` line in the `script:` blocks.
|
|
| 25 |
+ # MESON_ARGS: >-
|
|
| 26 |
+ # -Dfoo=enabled
|
|
| 27 |
+ # -Dbar=disabled
|
|
| 28 |
+ before_script:
|
|
| 29 |
+ # Make sure meson is up to date, so we don't need to rebuild the image
|
|
| 30 |
+ # with each release.
|
|
| 31 |
+ - pip3 install -U meson ninja
|
|
| 32 |
+ script:
|
|
| 33 |
+ # For some reason, options are separated by newlines instead of spaces,
|
|
| 34 |
+ # so we have to replace them first.
|
|
| 35 |
+ #- $env:MESON_ARGS = $env:MESON_ARGS.replace("`n"," ")
|
|
| 36 |
+ # Gitlab executes PowerShell in docker, but `VsDevCmd.bat` is a batch
|
|
| 37 |
+ # script. Environment variables substitutions is done by PowerShell
|
|
| 38 |
+ # before calling `cmd.exe`, that's why we use `$env:FOO` instead of
|
|
| 39 |
+ # `%FOO%`.
|
|
| 40 |
+ - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
|
|
| 41 |
+ meson setup build $env:MESON_ARGS_WINDOWS &&
|
|
| 42 |
+ meson compile --verbose -C build &&
|
|
| 43 |
+ meson test -C build &&
|
|
| 44 |
+ meson test -C build --benchmark"
|
|
| 45 |
+ |
|
| 46 |
+meson vs2017 amd64:
|
|
| 47 |
+ extends: '.build meson windows'
|
|
| 48 |
+ variables:
|
|
| 49 |
+ ARCH: 'amd64'
|
|
| 50 |
+ |
|
| 51 |
+meson vs2017 x86:
|
|
| 52 |
+ extends: '.build meson windows'
|
|
| 53 |
+ variables:
|
|
| 54 |
+ ARCH: 'x86'
|
| 1 |
+2021-03-07 Tim-Philipp Müller <tim@centricular.com>
|
|
| 2 |
+ |
|
| 3 |
+ [ci] Add basic support for Meson builds with MSVC on Windows.
|
|
| 4 |
+ |
|
| 5 |
+ This adds meson jobs for VS2017 (x86 and x86_64).
|
|
| 6 |
+ |
|
| 7 |
+ * .gitlab-ci.yml: New file.
|
|
| 8 |
+ |
|
| 9 |
+2021-03-07 Tim-Philipp Müller <tim@centricular.com>
|
|
| 10 |
+ |
|
| 11 |
+ [meson] Add subproject fallbacks for 'libpng' and 'zlib'.
|
|
| 12 |
+ |
|
| 13 |
+ * subprojects/libpng.wrap, subprojects/zlib.wrap: New files.
|
|
| 14 |
+ |
|
| 15 |
+ * meson.build: Updated.
|
|
| 16 |
+ |
|
| 1 | 17 |
2021-03-07 Xavier Claessens <xavier.claessens@collabora.com>
|
| 2 | 18 |
|
| 3 | 19 |
[meson] Make it work with Windows.
|
| ... | ... | @@ -229,8 +229,7 @@ ftoption_command = process_header_command |
| 229 | 229 |
|
| 230 | 230 |
|
| 231 | 231 |
# GZip support
|
| 232 |
-zlib_dep = dependency('zlib', required: get_option('zlib'),
|
|
| 233 |
- fallback: ['zlib', 'zlib_dep'])
|
|
| 232 |
+zlib_dep = dependency('zlib', required: get_option('zlib'), fallback: 'zlib')
|
|
| 234 | 233 |
if zlib_dep.found()
|
| 235 | 234 |
ftoption_command += [
|
| 236 | 235 |
'--enable=FT_CONFIG_OPTION_USE_ZLIB',
|
| ... | ... | @@ -251,7 +250,7 @@ if bzip2_dep.found() |
| 251 | 250 |
endif
|
| 252 | 251 |
|
| 253 | 252 |
# PNG support
|
| 254 |
-libpng_dep = dependency('libpng', required: get_option('png'))
|
|
| 253 |
+libpng_dep = dependency('libpng', required: get_option('png'), fallback: 'libpng')
|
|
| 255 | 254 |
if libpng_dep.found()
|
| 256 | 255 |
ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_PNG']
|
| 257 | 256 |
ft2_deps += [libpng_dep]
|
| 1 |
+[wrap-file]
|
|
| 2 |
+directory = libpng-1.6.37
|
|
| 3 |
+source_url = https://github.com/glennrp/libpng/archive/v1.6.37.tar.gz
|
|
| 4 |
+source_filename = libpng-1.6.37.tar.gz
|
|
| 5 |
+source_hash = ca74a0dace179a8422187671aee97dd3892b53e168627145271cad5b5ac81307
|
|
| 6 |
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/libpng/1.6.37/3/get_zip
|
|
| 7 |
+patch_filename = libpng-1.6.37-3-wrap.zip
|
|
| 8 |
+patch_hash = 6c9f32fd9150b3a96ab89be52af664e32207e10aa9f5fb9aa015989ee2dd7100
|
|
| 9 |
+ |
|
| 10 |
+[provide]
|
|
| 11 |
+libpng = libpng_dep
|
| 1 |
+[wrap-file]
|
|
| 2 |
+directory = zlib-1.2.11
|
|
| 3 |
+source_url = http://zlib.net/fossils/zlib-1.2.11.tar.gz
|
|
| 4 |
+source_filename = zlib-1.2.11.tar.gz
|
|
| 5 |
+source_hash = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
|
|
| 6 |
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.11/5/get_zip
|
|
| 7 |
+patch_filename = zlib-1.2.11-5-wrap.zip
|
|
| 8 |
+patch_hash = 728c8e24acbc2e6682fbd950fec39e2fc77528af361adb87259f8a8511434004
|
|
| 9 |
+ |
|
| 10 |
+[provide]
|
|
| 11 |
+zlib = zlib_dep
|
|
| 12 |
+ |