[gimp/wip/Jehan/native-win64-build] build: clean up a bit the dependencies.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/Jehan/native-win64-build] build: clean up a bit the dependencies.
- Date: Wed, 5 May 2021 16:54:03 +0000 (UTC)
commit d5f95461886d7ebca244168cbf2ede7ebc3bc5d2
Author: Jehan <jehan girinstud io>
Date: Wed May 5 18:53:50 2021 +0200
build: clean up a bit the dependencies.
build/windows/gitlab-ci/build-deps-msys2.sh | 14 +++++---------
build/windows/gitlab-ci/build-gimp-msys2.sh | 7 +------
2 files changed, 6 insertions(+), 15 deletions(-)
---
diff --git a/build/windows/gitlab-ci/build-deps-msys2.sh b/build/windows/gitlab-ci/build-deps-msys2.sh
index 71d5925588..8cd318f9bc 100644
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@@ -34,23 +34,17 @@ pacman --noconfirm -S --needed \
mingw-w64-$MSYS2_ARCH-pkg-config \
mingw-w64-$MSYS2_ARCH-meson \
\
- mingw-w64-$MSYS2_ARCH-asciidoc \
- mingw-w64-$MSYS2_ARCH-atk \
mingw-w64-$MSYS2_ARCH-cairo \
mingw-w64-$MSYS2_ARCH-gobject-introspection \
- mingw-w64-$MSYS2_ARCH-gobject-introspection-runtime \
mingw-w64-$MSYS2_ARCH-json-glib \
mingw-w64-$MSYS2_ARCH-lcms2 \
mingw-w64-$MSYS2_ARCH-lensfun \
- mingw-w64-$MSYS2_ARCH-libarchive \
- mingw-w64-$MSYS2_ARCH-libepoxy \
mingw-w64-$MSYS2_ARCH-libspiro \
mingw-w64-$MSYS2_ARCH-maxflow \
+ mingw-w64-$MSYS2_ARCH-openexr \
mingw-w64-$MSYS2_ARCH-pango \
- mingw-w64-$MSYS2_ARCH-shared-mime-info \
mingw-w64-$MSYS2_ARCH-suitesparse \
- mingw-w64-$MSYS2_ARCH-vala \
- mingw-w64-$MSYS2_ARCH-xpm-nox
+ mingw-w64-$MSYS2_ARCH-vala
export GIT_DEPTH=1
export GIMP_PREFIX=`realpath ./_install`
@@ -72,6 +66,8 @@ ninja install
mkdir ../../_gegl/_build
cd ../../_gegl/_build
-meson -Dprefix="${GIMP_PREFIX}" -Ddocs=false ..
+meson -Dprefix="${GIMP_PREFIX}" -Ddocs=false \
+ -Dcairo=enabled -Dumfpack=enabled \
+ -Dopenexr=enabled -Dworkshop=true ..
ninja
ninja install
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index a687d6708c..86e5de2fc5 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -34,8 +34,6 @@ pacman --noconfirm -S --needed \
mingw-w64-$MSYS2_ARCH-ccache \
mingw-w64-$MSYS2_ARCH-pkg-config \
\
- mingw-w64-$MSYS2_ARCH-asciidoc \
- mingw-w64-$MSYS2_ARCH-adwaita-icon-theme \
mingw-w64-$MSYS2_ARCH-appstream-glib \
mingw-w64-$MSYS2_ARCH-atk \
mingw-w64-$MSYS2_ARCH-cairo \
@@ -47,17 +45,14 @@ pacman --noconfirm -S --needed \
mingw-w64-$MSYS2_ARCH-gobject-introspection-runtime \
mingw-w64-$MSYS2_ARCH-graphviz \
mingw-w64-$MSYS2_ARCH-gtk3 \
- mingw-w64-$MSYS2_ARCH-gtk-doc \
mingw-w64-$MSYS2_ARCH-iso-codes \
mingw-w64-$MSYS2_ARCH-json-c \
mingw-w64-$MSYS2_ARCH-json-glib \
mingw-w64-$MSYS2_ARCH-lcms2 \
mingw-w64-$MSYS2_ARCH-lensfun \
mingw-w64-$MSYS2_ARCH-libarchive \
- mingw-w64-$MSYS2_ARCH-libepoxy \
mingw-w64-$MSYS2_ARCH-libheif \
mingw-w64-$MSYS2_ARCH-libmypaint \
- mingw-w64-$MSYS2_ARCH-libraw \
mingw-w64-$MSYS2_ARCH-libspiro \
mingw-w64-$MSYS2_ARCH-libwebp \
mingw-w64-$MSYS2_ARCH-libwmf \
@@ -67,8 +62,8 @@ pacman --noconfirm -S --needed \
mingw-w64-$MSYS2_ARCH-openexr \
mingw-w64-$MSYS2_ARCH-pango \
mingw-w64-$MSYS2_ARCH-poppler \
+ mingw-w64-$MSYS2_ARCH-poppler-data \
mingw-w64-$MSYS2_ARCH-python3-gobject \
- mingw-w64-$MSYS2_ARCH-SDL2 \
mingw-w64-$MSYS2_ARCH-shared-mime-info \
mingw-w64-$MSYS2_ARCH-suitesparse \
mingw-w64-$MSYS2_ARCH-vala \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]