[gimp/wip/Jehan/incremental-win-installer-improvements] Test.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/Jehan/incremental-win-installer-improvements] Test.
- Date: Sat, 15 May 2021 23:53:02 +0000 (UTC)
commit 124ee681a94307aee5e8d27567ab7394a54a0565
Author: Jehan <jehan girinstud io>
Date: Sun May 16 01:52:36 2021 +0200
Test.
.gitlab-ci.yml | 1 +
build/windows/gitlab-ci/build-deps-msys2.sh | 43 +++++++++++++++--------------
2 files changed, 23 insertions(+), 21 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ebc151ce6f..127ec6aefd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -212,6 +212,7 @@ deps-win64-native:
expire_in: 2 hours
paths:
- _install-w64
+ - aalib-1.4.0/_build
needs: []
gimp-win64-native:
diff --git a/build/windows/gitlab-ci/build-deps-msys2.sh b/build/windows/gitlab-ci/build-deps-msys2.sh
index ad5fe79d72..d44fe0b774 100644
--- a/build/windows/gitlab-ci/build-deps-msys2.sh
+++ b/build/windows/gitlab-ci/build-deps-msys2.sh
@@ -63,27 +63,6 @@ export LD_LIBRARY_PATH="${GIMP_PREFIX}/lib:${LD_LIBRARY_PATH}"
export ACLOCAL_FLAGS="-I/c/msys64/mingw64/share/aclocal"
export XDG_DATA_DIRS="${GIMP_PREFIX}/share:/mingw64/share/"
-# For babl and GEGL, use the master branch.
-git clone --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/babl.git _babl
-git clone --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/gegl.git _gegl
-
-mkdir _babl/_build
-cd _babl/_build
-meson -Dprefix="${GIMP_PREFIX}" -Dwith-docs=false \
- ${BABL_OPTIONS} ..
-ninja
-ninja install
-
-mkdir ../../_gegl/_build
-cd ../../_gegl/_build
-meson -Dprefix="${GIMP_PREFIX}" -Ddocs=false \
- -Dcairo=enabled -Dumfpack=enabled \
- -Dopenexr=enabled -Dworkshop=true \
- ${GEGL_OPTIONS} ..
-ninja
-ninja install
-cd ../..
-
## AA-lib (not available in MSYS2) ##
wget https://downloads.sourceforge.net/aa-project/aalib-1.4rc5.tar.gz
@@ -104,3 +83,25 @@ cd _build
../configure --prefix="${GIMP_PREFIX}"
make
make install
+cd ../..
+
+# For babl and GEGL, use the master branch.
+git clone --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/babl.git _babl
+git clone --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/gegl.git _gegl
+
+mkdir _babl/_build
+cd _babl/_build
+meson -Dprefix="${GIMP_PREFIX}" -Dwith-docs=false \
+ ${BABL_OPTIONS} ..
+ninja
+ninja install
+
+mkdir ../../_gegl/_build
+cd ../../_gegl/_build
+meson -Dprefix="${GIMP_PREFIX}" -Ddocs=false \
+ -Dcairo=enabled -Dumfpack=enabled \
+ -Dopenexr=enabled -Dworkshop=true \
+ ${GEGL_OPTIONS} ..
+ninja
+ninja install
+cd ../..
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]