Add workaround for compilation warning in SDL 1.2 with new Mesa.

1 files changed, 12 insertions, 0 deletions

diff --git a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml
index d3ee6b015..adf9f738c 100644
--- a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml
@@ -19,6 +19,7 @@
 gcc-6_sanitize_doctest_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame
   - ldd ./src/manaplustests | grep "libasan"
   <<: *job-push
@@ -34,6 +35,7 @@ gcc-6_sanitize_doctest_tests:
 gcc-6_doctest_tests_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame
   image: vicamo/debian:sid-i386
   <<: *job-push
@@ -49,6 +51,7 @@ gcc-6_doctest_tests_i386:
 gcc-6_tests_simd:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_tests_simd.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -63,6 +66,7 @@ gcc-6_tests_simd:
 gcc-6_tests_lto:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -78,6 +82,7 @@ gcc-6_tests_lto:
 gcc-6_tests_lto_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   image: vicamo/debian:sid-i386
@@ -94,6 +99,7 @@ gcc-6_tests_lto_i386:
 gcc-6_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -108,6 +114,7 @@ gcc-6_tests:
 gcc-6_tests_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame
   image: vicamo/debian:sid-i386
   <<: *job-push
@@ -123,6 +130,7 @@ gcc-6_tests_i386:
 gcc-6_tests_glibcdebug:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug
   <<: *job-push
   variables:
@@ -137,6 +145,7 @@ gcc-6_tests_glibcdebug:
 gcc-6_tests_glibcdebug_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug
   image: vicamo/debian:sid-i386
   <<: *job-push
@@ -181,6 +190,7 @@ gcc-6_sdl2_tests_i386:
 gcc-6_tests_valgrind:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame || true
   - echo test valgrind
   - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log
@@ -199,6 +209,7 @@ gcc-6_tests_valgrind:
 gcc-6_tests_valgrind_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame || true
   - echo test valgrind
   - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log
@@ -217,6 +228,7 @@ gcc-6_tests_valgrind_i386:
 gcc-6_tarball_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_tarball_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables: