From e384b234da9822197fab3eee665fdd2bceced08f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 24 Nov 2018 23:23:14 +0300
Subject: Add workaround for compilation warning in SDL 1.2 with new Mesa.

---
 .gitlab-ci.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e4d39704..0022f817c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,6 +46,7 @@ variables:
 gcc-5_c++11_i386:
   stage: prebuild
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5_c++11.sh
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
@@ -62,6 +63,7 @@ gcc-5_c++11_i386:
 gcc-8-i386:
   stage: prebuild
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
@@ -78,6 +80,7 @@ gcc-8-i386:
 gcc-7-i386:
   stage: prebuild
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7.sh
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/scripts/rundyecmd.sh
@@ -95,6 +98,7 @@ gcc-7-i386:
 clang-3.9:
   stage: prebuild
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/clang39.sh
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/scripts/rundyecmd.sh
@@ -110,6 +114,7 @@ clang-3.9:
 gcc-6:
   stage: prebuild
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6.sh
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/scripts/rundyecmd.sh
@@ -124,6 +129,7 @@ gcc-6:
 gcc-8:
   stage: prebuild
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/scripts/rundyecmd.sh
@@ -138,6 +144,7 @@ gcc-8:
 gcc-6_default:
   stage: prebuild
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/any_compiler.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/scripts/rundyecmd.sh
@@ -156,6 +163,7 @@ gcc-6_default:
 gcc-7_default:
   stage: prebuild
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/any_compiler.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/scripts/rundyecmd.sh
@@ -216,6 +224,7 @@ gcc-5_sdl2:
 gcc-7_game_only:
   stage: prebuild
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7.sh --without-dyecmd
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -229,6 +238,7 @@ gcc-7_game_only:
 gcc-7_dyecmd_only:
   stage: prebuild
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7.sh --without-manaplusgame
   - ./tools/ci/scripts/rundyecmd.sh
   <<: *job-push
@@ -241,6 +251,7 @@ gcc-7_dyecmd_only:
 gcc-8_unittestsbin:
   stage: prebuild
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin --without-manaplusgame --without-dyecmd
   <<: *job-push
   variables:
@@ -274,6 +285,7 @@ linters:
 gcc-5_h_all:
   stage: prebuild
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL
   - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL
   - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL
@@ -289,6 +301,7 @@ gcc-5_h_all:
 gcc-5_h_all_i386:
   stage: prebuild
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL
   - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL
   - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL
@@ -470,6 +483,7 @@ triggers:
 .gcc-7_zlib_ng_develop:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION}
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc7.sh
   - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus
-- 
cgit v1.2.3-70-g09d2