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

23 files changed, 152 insertions, 0 deletions

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
diff --git a/tools/ci/branches/ci_checks/.gitlab-ci.yml b/tools/ci/branches/ci_checks/.gitlab-ci.yml
index 07a540a1e..e25d82de3 100644
--- a/tools/ci/branches/ci_checks/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_checks/.gitlab-ci.yml
@@ -19,6 +19,7 @@
 gcc8_memdebug_sdl1:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh --enable-memdebug --enable-werror
   <<: *job-push
   variables:
@@ -43,6 +44,7 @@ gcc8_memdebug_sdl2:
 gcc8_googleprofiler_sdl1:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh --enable-googleprofiler --enable-werror
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -69,6 +71,7 @@ gcc8_googleprofiler_sdl2:
 gcc8_checks_sdl1:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh --enable-checks --enable-werror
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
diff --git a/tools/ci/branches/ci_clang-tidy/.gitlab-ci.yml b/tools/ci/branches/ci_clang-tidy/.gitlab-ci.yml
index 31776892c..56bc2be30 100644
--- a/tools/ci/branches/ci_clang-tidy/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_clang-tidy/.gitlab-ci.yml
@@ -17,6 +17,7 @@
 clang-tidy:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/clang_tidy.sh
   <<: *job-push
   variables:
diff --git a/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml b/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml
index 23b8687fd..ebc9c99e1 100644
--- a/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml
@@ -19,6 +19,7 @@
 clang-4.0:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/clang40.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -35,6 +36,7 @@ clang-4.0:
 clang-5.0:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/clang50.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
diff --git a/tools/ci/branches/ci_clang6/.gitlab-ci.yml b/tools/ci/branches/ci_clang6/.gitlab-ci.yml
index fbbfa8bee..87928a726 100644
--- a/tools/ci/branches/ci_clang6/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_clang6/.gitlab-ci.yml
@@ -17,6 +17,7 @@
 clang-6.0_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -31,6 +32,7 @@ clang-6.0_tests:
 clang-6.0_tests_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   image: vicamo/debian:sid-i386
@@ -75,6 +77,7 @@ clang-6.0_tests_sdl2_i386:
 clang-6.0:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/clang60.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -90,6 +93,7 @@ clang-6.0:
 clang-6.0_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/clang60.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
diff --git a/tools/ci/branches/ci_clang7/.gitlab-ci.yml b/tools/ci/branches/ci_clang7/.gitlab-ci.yml
index 5231ad073..6b46e9fb1 100644
--- a/tools/ci/branches/ci_clang7/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_clang7/.gitlab-ci.yml
@@ -17,6 +17,7 @@
 clang-7.0_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -31,6 +32,7 @@ clang-7.0_tests:
 clang-7.0_tests_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   image: vicamo/debian:sid-i386
@@ -75,6 +77,7 @@ clang-7.0_tests_sdl2_i386:
 clang-7.0:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/clang70.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -90,6 +93,7 @@ clang-7.0:
 clang-7.0_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/clang70.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
diff --git a/tools/ci/branches/ci_customnls/.gitlab-ci.yml b/tools/ci/branches/ci_customnls/.gitlab-ci.yml
index 1d8720bcd..dfafdacf0 100644
--- a/tools/ci/branches/ci_customnls/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_customnls/.gitlab-ci.yml
@@ -17,6 +17,7 @@
 gcc_with_customnls:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5.sh --enable-customnls --enable-werror
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -43,6 +44,7 @@ gcc_with_customnls_sdl2:
 gcc_with_customnls_nonls:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5.sh --enable-customnls --disable-nls --enable-werror
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
diff --git a/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml b/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml
index a45754285..ee9f61205 100644
--- a/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml
@@ -19,6 +19,7 @@
 gcc-snapshot:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gccsnapshot.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -34,6 +35,7 @@ gcc-snapshot:
 gcc-snapshot_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gccsnapshot.sh
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
diff --git a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml
index 088e4ad03..468468ec8 100644
--- a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml
@@ -19,6 +19,7 @@
 gcc-5_c++11_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5_c++11.sh
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
@@ -50,6 +51,7 @@ gcc-5_sdl2:
 gcc-5_sanitize_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5_sanitize_tests.sh
   - ldd ./src/manaplustests | grep "libasan"
   <<: *job-push
@@ -66,6 +68,7 @@ gcc-5_sanitize_tests:
 .gcc-5_sanitize_tests_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-dyecmd --without-manaplusgame
   - ldd ./src/manaplustests | grep "libasan"
   image: vicamo/debian:sid-i386
@@ -82,6 +85,7 @@ gcc-5_sanitize_tests:
 gcc-5_sanitize_no_opengl_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl --without-dyecmd --without-manaplusgame
   - ldd ./src/manaplustests | grep "libasan"
   <<: *job-push
@@ -98,6 +102,7 @@ gcc-5_sanitize_no_opengl_tests:
 .gcc-5_sanitize_no_opengltests_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl --without-dyecmd --without-manaplusgame
   - ldd ./src/manaplustests | grep "libasan"
   image: vicamo/debian:sid-i386
@@ -114,6 +119,7 @@ gcc-5_sanitize_no_opengl_tests:
 gcc-5_sanitize:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5_sanitize.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -130,6 +136,7 @@ gcc-5_sanitize:
 .gcc-5_sanitize_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5_sanitize.sh
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
@@ -146,6 +153,7 @@ gcc-5_sanitize:
 gcc-5_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5_tests.sh --without-dyecmd
   <<: *job-push
   variables:
@@ -160,6 +168,7 @@ gcc-5_tests:
 gcc-5_tests_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5_tests.sh --without-dyecmd --without-manaplusgame
   image: vicamo/debian:sid-i386
   <<: *job-push
@@ -234,6 +243,7 @@ gcc-5_sdl2_no_opengl_tests_i386:
 gcc-5:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/jobs/gcc5_c++11.sh
@@ -265,6 +275,7 @@ gcc-5_sdl2_c++11_i386:
 gcc-5_default:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/any_compiler.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -282,6 +293,7 @@ gcc-5_default:
 gcc-5_default_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/any_compiler.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -302,6 +314,7 @@ gcc-5_default_i386:
 gcc-5_tarball:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5_tarball.sh
   <<: *job-push
   variables:
diff --git a/tools/ci/branches/ci_gcc6/.gitlab-ci.yml b/tools/ci/branches/ci_gcc6/.gitlab-ci.yml
index f7acd1afd..edaebf0b6 100644
--- a/tools/ci/branches/ci_gcc6/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc6/.gitlab-ci.yml
@@ -19,6 +19,7 @@
 gcc-6-i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6.sh
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
@@ -35,6 +36,7 @@ gcc-6-i386:
 gcc-6:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -75,6 +77,7 @@ gcc-6_sdl2_i386:
 gcc-6_default:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/any_compiler.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -92,6 +95,7 @@ gcc-6_default:
 gcc-6_sanitize:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_sanitize.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -108,6 +112,7 @@ gcc-6_sanitize:
 .gcc-6_sanitize_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_sanitize.sh
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
@@ -139,6 +144,7 @@ gcc-6_sanitize_sdl2:
 gcc-6_lto:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_lto.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -152,6 +158,7 @@ gcc-6_lto:
 gcc-6_lto_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_lto.sh
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
@@ -168,6 +175,7 @@ gcc-6_lto_i386:
 gcc-6_default_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/any_compiler.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
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:
diff --git a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml
index 7a7859522..649809752 100644
--- a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml
@@ -19,6 +19,7 @@
 gcc-7-i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7.sh
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
@@ -35,6 +36,7 @@ gcc-7-i386:
 gcc-7:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -75,6 +77,7 @@ gcc-7_sdl2_i386:
 gcc-7_default:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/any_compiler.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -92,6 +95,7 @@ gcc-7_default:
 gcc-7_sanitize:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_sanitize.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -108,6 +112,7 @@ gcc-7_sanitize:
 .gcc-7_sanitize_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_sanitize.sh
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
@@ -139,6 +144,7 @@ gcc-7_sanitize_sdl2:
 gcc-7_lto:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_lto.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -153,6 +159,7 @@ gcc-7_lto:
 gcc-7_lto_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_lto.sh
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
@@ -170,6 +177,7 @@ gcc-7_lto_i386:
 gcc-7_default_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/any_compiler.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
diff --git a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml
index 270c206ad..bb776033a 100644
--- a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml
@@ -19,6 +19,7 @@
 gcc-7_sanitize_doctest_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame
   - ldd ./src/manaplustests | grep "libasan"
   <<: *job-push
@@ -35,6 +36,7 @@ gcc-7_sanitize_doctest_tests:
 gcc-7_doctest_tests_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame
   image: vicamo/debian:sid-i386
   <<: *job-push
@@ -51,6 +53,7 @@ gcc-7_doctest_tests_i386:
 gcc-7_tests_simd:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -65,6 +68,7 @@ gcc-7_tests_simd:
 gcc-7_tests_O0:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -80,6 +84,7 @@ gcc-7_tests_O0:
 gcc-7_tests_O1:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -95,6 +100,7 @@ gcc-7_tests_O1:
 gcc-7_tests_lto:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -110,6 +116,7 @@ gcc-7_tests_lto:
 gcc-7_tests_lto_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   image: vicamo/debian:sid-i386
@@ -126,6 +133,7 @@ gcc-7_tests_lto_i386:
 gcc-7_tests_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame
   image: vicamo/debian:sid-i386
   <<: *job-push
@@ -141,6 +149,7 @@ gcc-7_tests_i386:
 gcc-7_tests_flags:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug
   - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug
   <<: *job-push
@@ -156,6 +165,7 @@ gcc-7_tests_flags:
 gcc-7_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -185,6 +195,7 @@ gcc-7_sdl2_tests_i386:
 .gcc-7_tests_valgrind:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_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
@@ -202,6 +213,7 @@ gcc-7_sdl2_tests_i386:
 .gcc-7_tests_valgrind_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_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
@@ -220,6 +232,7 @@ gcc-7_sdl2_tests_i386:
 gcc-7_separate_doctest:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd
   - ./tools/ci/scripts/separateunittests.sh
   <<: *job-push
@@ -233,6 +246,7 @@ gcc-7_separate_doctest:
 gcc-7_separate_doctest_sanitize:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd
   - ./tools/ci/scripts/separateunittests.sh
   - ldd ./src/manaplustests | grep "libasan"
@@ -283,6 +297,7 @@ gcc-7_separate_doctest_sanitize_sdl2:
 gcc-7_separate_doctest_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd
   - ./tools/ci/scripts/separateunittests.sh
   <<: *job-push
@@ -315,6 +330,7 @@ gcc-7_separate_doctest_sdl2_i386:
 gcc-7_unsigned_char_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
diff --git a/tools/ci/branches/ci_gcc8/.gitlab-ci.yml b/tools/ci/branches/ci_gcc8/.gitlab-ci.yml
index a3903b1dd..d8a5820d0 100644
--- a/tools/ci/branches/ci_gcc8/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc8/.gitlab-ci.yml
@@ -46,6 +46,7 @@ gcc-8_sdl2_i386:
 gcc-8_default:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/any_compiler.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -63,6 +64,7 @@ gcc-8_default:
 gcc-8_sanitize:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_sanitize.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -93,6 +95,7 @@ gcc-8_sanitize_sdl2:
 gcc-8_lto:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_lto.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -107,6 +110,7 @@ gcc-8_lto:
 gcc-8_lto_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_lto.sh
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
diff --git a/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml
index 331a31a9e..64570cd5c 100644
--- a/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml
@@ -20,6 +20,7 @@
 .gcc-8_sanitize_doctest_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame
   - ldd ./src/manaplustests | grep "libasan"
   <<: *job-push
@@ -37,6 +38,7 @@
 .gcc-8_sanitize_glibcdebug_doctest_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_sanitize_tests.sh --enable-glibcdebug --enable-unittests=doctest --without-dyecmd --without-manaplusgame
   - ldd ./src/manaplustests | grep "libasan"
   <<: *job-push
@@ -53,6 +55,7 @@
 gcc-8_doctest_tests_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame
   image: vicamo/debian:sid-i386
   <<: *job-push
@@ -69,6 +72,7 @@ gcc-8_doctest_tests_i386:
 gcc-8_tests_simd:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests_simd.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -83,6 +87,7 @@ gcc-8_tests_simd:
 gcc-8_tests_O0:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests_simd.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -98,6 +103,7 @@ gcc-8_tests_O0:
 gcc-8_tests_O1:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests_simd.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -113,6 +119,7 @@ gcc-8_tests_O1:
 gcc-8_tests_lto:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -128,6 +135,7 @@ gcc-8_tests_lto:
 gcc-8_tests_lto_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   image: vicamo/debian:sid-i386
@@ -144,6 +152,7 @@ gcc-8_tests_lto_i386:
 gcc-8_tests_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame
   image: vicamo/debian:sid-i386
   <<: *job-push
@@ -159,6 +168,7 @@ gcc-8_tests_i386:
 gcc-8_tests_flags:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug
   <<: *job-push
@@ -174,6 +184,7 @@ gcc-8_tests_flags:
 gcc-8_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -203,6 +214,7 @@ gcc-8_sdl2_tests_i386:
 .gcc-8_tests_valgrind:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_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
@@ -220,6 +232,7 @@ gcc-8_sdl2_tests_i386:
 .gcc-8_tests_valgrind_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_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
@@ -238,6 +251,7 @@ gcc-8_sdl2_tests_i386:
 gcc-8_separate_doctest:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd
   - ./tools/ci/scripts/separateunittests.sh
   <<: *job-push
@@ -251,6 +265,7 @@ gcc-8_separate_doctest:
 gcc-8_separate_doctest_sanitize:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd
   - ./tools/ci/scripts/separateunittests.sh
   - ldd ./src/manaplustests | grep "libasan"
@@ -301,6 +316,7 @@ gcc-8_separate_doctest_sanitize_sdl2:
 gcc-8_separate_doctest_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd
   - ./tools/ci/scripts/separateunittests.sh
   <<: *job-push
@@ -333,6 +349,7 @@ gcc-8_separate_doctest_sdl2_i386:
 gcc-8_all_and_unittestsbin:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -346,6 +363,7 @@ gcc-8_all_and_unittestsbin:
 gcc-8_systemcatch_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=systemcatch --without-dyecmd --without-manaplusgame 
   <<: *job-push
   variables:
@@ -361,6 +379,7 @@ gcc-8_systemcatch_tests:
 gcc-8_systemdoctest_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=systemdoctest --without-dyecmd --without-manaplusgame 
   <<: *job-push
   variables:
@@ -376,6 +395,7 @@ gcc-8_systemdoctest_tests:
 gcc-8_unsigned_char_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -391,6 +411,7 @@ gcc-8_unsigned_char_tests:
 gcc-8_sdl2_unsigned_char_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
diff --git a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml
index c7f666e7a..4b079a1bc 100644
--- a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml
@@ -19,6 +19,7 @@
 gcc-8_tests_glibcdebug_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug
   image: vicamo/debian:sid-i386
   <<: *job-push
@@ -34,6 +35,7 @@ gcc-8_tests_glibcdebug_i386:
 gcc-8_glibcdebug:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh --enable-glibcdebug --without-dyecmd
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -47,6 +49,7 @@ gcc-8_glibcdebug:
 gcc-8_glibcdebug_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh --enable-glibcdebug --without-dyecmd
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -89,6 +92,7 @@ gcc-8_glibcdebug_sdl2_i386:
 clang-7.0_glibcdebug_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug
   <<: *job-push
   variables:
@@ -117,6 +121,7 @@ clang-7.0_glibcdebug_tests_sdl2:
 clang-7.0_glibcdebug:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/clang70.sh --enable-glibcdebug
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
diff --git a/tools/ci/branches/ci_h/.gitlab-ci.yml b/tools/ci/branches/ci_h/.gitlab-ci.yml
index 0859c4a17..bacaa8fef 100644
--- a/tools/ci/branches/ci_h/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_h/.gitlab-ci.yml
@@ -17,6 +17,7 @@
 gcc-5_h_all:
   stage: build
   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
@@ -33,6 +34,7 @@ gcc-5_h_all:
 gcc-5_h_all_i386:
   stage: build
   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
@@ -52,6 +54,7 @@ gcc-5_h_all_i386:
 gcc-5_h_pugi_all:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_PUGIXML -I/usr/include/SDL
   - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_PUGIXML -I/usr/include/SDL
   - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_PUGIXML -I/usr/include/SDL
@@ -68,6 +71,7 @@ gcc-5_h_pugi_all:
 gcc-5_h_tinyxml2_all:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_TINYXML2 -I/usr/include/SDL
   - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_TINYXML2 -I/usr/include/SDL
   - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_TINYXML2 -I/usr/include/SDL
diff --git a/tools/ci/branches/ci_main1/.gitlab-ci.yml b/tools/ci/branches/ci_main1/.gitlab-ci.yml
index 898a2c872..631bba20c 100644
--- a/tools/ci/branches/ci_main1/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_main1/.gitlab-ci.yml
@@ -20,6 +20,7 @@
 .gcc-7_sanitize_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_sanitize.sh
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
@@ -37,6 +38,7 @@
 gcc-7_sanitize:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_sanitize.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -52,6 +54,7 @@ gcc-7_sanitize:
 gcc-7_lto:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_lto.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -66,6 +69,7 @@ gcc-7_lto:
 gcc-7_lto_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_lto.sh
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
@@ -117,6 +121,7 @@ gcc-gentoo_sdl2:
 gcc8_without_mumble_sdl1:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh --without-mumble --enable-werror
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -143,6 +148,7 @@ gcc8_without_mumble_sdl2:
 gcc_portable:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh --with-opengl --enable-tmwa --enable-portable=yes
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -156,6 +162,7 @@ gcc_portable:
 gcc-8_no_asserts:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh --disable-asserts
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -169,6 +176,7 @@ gcc-8_no_asserts:
 gcc-8_default_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/any_compiler.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -189,6 +197,7 @@ gcc-8_default_i386:
 gcc-8_openglerrors_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh --enable-openglerrors
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -203,6 +212,7 @@ gcc-8_openglerrors_i386:
 gcc-8_openglerrors:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh --enable-openglerrors
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -216,6 +226,7 @@ gcc-8_openglerrors:
 gcc-8_unsigned_char:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -244,6 +255,7 @@ gcc-8_unsigned_char_sdl2:
 gcc-8_password:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh --enable-commandlinepassword
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
diff --git a/tools/ci/branches/ci_malloc/.gitlab-ci.yml b/tools/ci/branches/ci_malloc/.gitlab-ci.yml
index 83638cd71..3a2e07eef 100644
--- a/tools/ci/branches/ci_malloc/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_malloc/.gitlab-ci.yml
@@ -18,6 +18,7 @@ gcc-8_tests_jmalloc:
   stage: build
   script:
   - ls ${MALLOC}
+  - ./tools/ci/scripts/patchsdl1.sh
   - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -34,6 +35,7 @@ gcc-8_tests_jmalloc_i386:
   stage: build
   script:
   - ls ${MALLOC}
+  - ./tools/ci/scripts/patchsdl1.sh
   - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   image: vicamo/debian:sid-i386
@@ -83,6 +85,7 @@ gcc-8_tests_jmalloc_sdl2_i386:
 gcc-8_tests_tcmalloc:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -97,6 +100,7 @@ gcc-8_tests_tcmalloc:
 gcc-8_tests_tcmalloc_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --without-dyecmd --without-manaplusgame
   <<: *job-push
   image: vicamo/debian:sid-i386
diff --git a/tools/ci/branches/ci_mse/.gitlab-ci.yml b/tools/ci/branches/ci_mse/.gitlab-ci.yml
index ec32617c2..8a5a8d585 100644
--- a/tools/ci/branches/ci_mse/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_mse/.gitlab-ci.yml
@@ -19,6 +19,7 @@
 gcc-7_tests_mse_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug
   image: vicamo/debian:sid-i386
   <<: *job-push
@@ -34,6 +35,7 @@ gcc-7_tests_mse_i386:
 gcc-7_mse:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7.sh --enable-stldebug --without-dyecmd
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -47,6 +49,7 @@ gcc-7_mse:
 gcc-7_mse_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc7.sh --enable-stldebug --without-dyecmd
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
diff --git a/tools/ci/branches/ci_site/.gitlab-ci.yml b/tools/ci/branches/ci_site/.gitlab-ci.yml
index 011f60fdc..579314f84 100644
--- a/tools/ci/branches/ci_site/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_site/.gitlab-ci.yml
@@ -36,6 +36,7 @@ gcc-6_tests_gcov:
   script:
   - ./tools/ci/scripts/clonesrc.sh
   - cd manaplus
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc6_tests_gcov.sh --without-dyecmd --without-manaplusgame
   <<: *job-push
   variables:
@@ -72,6 +73,7 @@ doxygen:
   script:
   - ./tools/ci/scripts/clonesrc.sh
   - cd manaplus
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/doxygen.sh
   artifacts:
     paths:
diff --git a/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml b/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml
index 576b29827..2ae175849 100644
--- a/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml
@@ -19,6 +19,7 @@
 gcc-8_pugixml_tests:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-libxml=pugixml
   <<: *job-push
   variables:
@@ -33,6 +34,7 @@ gcc-8_pugixml_tests:
 gcc-8_pugixml_tests_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-libxml=pugixml
   image: vicamo/debian:sid-i386
   <<: *job-push
@@ -48,6 +50,7 @@ gcc-8_pugixml_tests_i386:
 gcc-8_pugixml:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh --enable-libxml=pugixml
   - ./tools/ci/scripts/runtests.sh
   <<: *job-push
@@ -61,6 +64,7 @@ gcc-8_pugixml:
 gcc-8_pugixml_i386:
   stage: build
   script:
+  - ./tools/ci/scripts/patchsdl1.sh
   - ./tools/ci/jobs/gcc8.sh --enable-libxml=pugixml
   - ./tools/ci/scripts/runtests.sh
   image: vicamo/debian:sid-i386
diff --git a/tools/ci/scripts/patchsdl1.sh b/tools/ci/scripts/patchsdl1.sh
new file mode 100755
index 000000000..b97e12bbd
--- /dev/null
+++ b/tools/ci/scripts/patchsdl1.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Fix compilation warning
+sed -i 's|#define GL_GLEXT_VERSION 29|#ifndef GL_GLEXT_VERSION\n#define GL_GLEXT_VERSION 29\n#endif|' /usr/include/SDL/SDL_opengl.h