Browse Source

windows: fix cairo build

use_builds_script
Alexandros Theodotou 2 years ago
parent
commit
e4005806fd
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 4
      meson.build
  2. 2
      windows-msys/PKGBUILD-cairo-mingw.in
  3. 9
      windows-msys/meson.build

4
meson.build

@ -70,6 +70,8 @@ is_osx_brew = distro.contains ('osx-brew') @@ -70,6 +70,8 @@ is_osx_brew = distro.contains ('osx-brew')
is_gnu_linux = distro.contains ('gnu-linux')
is_appimage = distro.contains ('appimage')
meson_src_root = meson.source_root ()
global_conf = configuration_data ()
global_conf.set ('PREFIX', prefix)
global_conf.set (
@ -77,7 +79,7 @@ global_conf.set ( @@ -77,7 +79,7 @@ global_conf.set (
global_conf.set (
'MESON_BUILD_ROOT', meson.build_root ())
global_conf.set (
'MESON_SOURCE_ROOT', meson.source_root ())
'MESON_SOURCE_ROOT', meson_src_root)
global_conf.set (
'BASH', bash.full_path ())
global_conf.set (

2
windows-msys/PKGBUILD-cairo-mingw → windows-msys/PKGBUILD-cairo-mingw.in

@ -38,7 +38,7 @@ prepare() { @@ -38,7 +38,7 @@ prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
#patch --ignore-whitespace -p1 -i ${srcdir}/add_assert_to_cairo_surface.patch
patch --ignore-whitespace -p1 -i ${srcdir}/cairo_remove_fortify_source.patch
patch --ignore-whitespace -p1 -i @MESON_SOURCE_ROOT@/windows-msys/patches/cairo_remove_fortify_source.patch
}
build() {

9
windows-msys/meson.build

@ -44,6 +44,8 @@ windows_msys_conf.set ( @@ -44,6 +44,8 @@ windows_msys_conf.set (
'MINGW_PREFIX', mingw_prefix)
windows_msys_conf.set (
'MINGW_ARCH', mingw_arch)
windows_msys_conf.set (
'MESON_SOURCE_ROOT', meson_src_root)
windows_msys_conf.set ('IS_TAG', is_tag ? 'true' : 'false')
mingw_zrythm_pkgbuild = configure_file (
@ -56,6 +58,11 @@ mingw_carla_pkgbuild = configure_file ( @@ -56,6 +58,11 @@ mingw_carla_pkgbuild = configure_file (
input: 'PKGBUILD-carla-mingw.in',
configuration: windows_msys_conf,
)
mingw_cairo_pkgbuild = configure_file (
output: 'PKGBUILD-cairo-mingw',
input: 'PKGBUILD-cairo-mingw.in',
configuration: windows_msys_conf,
)
# configure scripts
make_windows_chroot = configure_file (
@ -264,7 +271,7 @@ lilv_pkg = custom_target ( @@ -264,7 +271,7 @@ lilv_pkg = custom_target (
cairo_pkg = custom_target (
'mingw-cairo',
output: 'cairo.pkg.tar.zst',
input: [ make_mingw_pkg, 'PKGBUILD-cairo-mingw', ],
input: [ make_mingw_pkg, mingw_cairo_pkgbuild, ],
command: make_mingw_pkg_cmd,
install: false,
)

Loading…
Cancel
Save