Remove SDL2 jobs.

1 files changed, 0 insertions, 611 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a92f20e..a5e58d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,60 +77,6 @@ variables:
               -fno-omit-frame-pointer"
   <<: *job-artifacts
 
-# disabled due kernel issue
-.SDL_default_asan:
-  stage: build
-  script:
-  - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config cmake
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev
-  - ./.ci/copyspm.sh
-  - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.4
-  - ./.ci/buildlib.sh SDL2 default _asan
-  - cp /usr/local/spm/env/runSDL2_default_asan.sh /usr/local/spm/env/runSDL_default_asan.sh
-  - ${runenvtool} ./.ci/buildlib.sh zlib master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libxml2 master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh curl master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh tinyxml2 4.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_image default
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_mixer default
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_net default
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_ttf default
-  - export LD_PRELOAD
-  - ./.ci/copyfinal.sh
-  variables:
-    installname: SDL_default_asan
-    runenvtool: /usr/local/spm/env/run${installname}.sh
-    runenvtoolz: /usr/local/spm/env/runzlib_master.sh
-    ASAN_OPTIONS: "detect_leaks=0"
-    CXXFLAGS: "-fsanitize=address -fsanitize=undefined
-               -fsanitize=shift -fsanitize=integer-divide-by-zero -fsanitize=unreachable
-               -fsanitize=vla-bound -fsanitize=null -fsanitize=return
-               -fsanitize=signed-integer-overflow -fsanitize=bounds -fsanitize=alignment
-               -fsanitize=object-size -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow
-               -fsanitize=nonnull-attribute -fsanitize=returns-nonnull-attribute -fsanitize=bool
-               -fsanitize=enum -fsanitize=vptr -fsanitize=bounds-strict
-               -fno-omit-frame-pointer"
-    CFLAGS: "-fsanitize=address -fsanitize=undefined
-             -fsanitize=shift -fsanitize=integer-divide-by-zero -fsanitize=unreachable
-             -fsanitize=vla-bound -fsanitize=null -fsanitize=return
-             -fsanitize=signed-integer-overflow -fsanitize=bounds -fsanitize=alignment
-             -fsanitize=object-size -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow
-             -fsanitize=nonnull-attribute -fsanitize=returns-nonnull-attribute -fsanitize=bool
-             -fsanitize=enum -fsanitize=vptr -fsanitize=bounds-strict
-             -fno-omit-frame-pointer"
-    LDFLAGS: "-lasan -lubsan
-              -fsanitize=address -fsanitize=undefined
-              -fsanitize=shift -fsanitize=integer-divide-by-zero -fsanitize=unreachable
-              -fsanitize=vla-bound -fsanitize=null -fsanitize=return
-              -fsanitize=signed-integer-overflow -fsanitize=bounds -fsanitize=alignment
-              -fsanitize=object-size -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow
-              -fsanitize=nonnull-attribute -fsanitize=returns-nonnull-attribute -fsanitize=bool
-              -fsanitize=enum -fsanitize=vptr -fsanitize=bounds-strict
-              -fno-omit-frame-pointer"
-  <<: *job-artifacts
-
 SDL_SDL-1.2:
   stage: build
   script:
@@ -157,31 +103,6 @@ SDL_SDL-1.2:
     runenvtoolz: /usr/local/spm/env/runzlib_master.sh
   <<: *job-artifacts
 
-SDL_default:
-  stage: build
-  script:
-  - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config cmake
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev
-  - ./.ci/copyspm.sh
-  - ./.ci/buildlib.sh SDL2 default
-  - cp /usr/local/spm/env/runSDL2_default.sh /usr/local/spm/env/runSDL_default.sh
-  - ${runenvtool} ./.ci/buildlib.sh zlib master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libxml2 master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh curl master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh tinyxml2 4.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_image default
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_mixer default
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_net default
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_ttf default
-  - ./.ci/copyfinal.sh
-  variables:
-    installname: SDL_default
-    runenvtool: /usr/local/spm/env/run${installname}.sh
-    runenvtoolz: /usr/local/spm/env/runzlib_master.sh
-  <<: *job-artifacts
-
 SDL_SDL-1.2_old:
   stage: build
   script:
@@ -210,184 +131,6 @@ SDL_SDL-1.2_old:
     runenvtoolz: /usr/local/spm/env/runzlib_v1.2.5.sh
   <<: *job-artifacts
 
-SDL_default_old:
-  stage: build
-  script:
-  - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config cmake
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libglu1-mesa-dev libasound2-dev libicu-dev 
-                     libjpeg-dev libtiff-dev
-                     bison flex
-  - ./.ci/copyspm.sh
-  - ./.ci/buildlib.sh SDL2 release-2.0.0
-  - cp /usr/local/spm/env/runSDL2_release-2.0.0.sh /usr/local/spm/env/runSDL_default_old.sh
-  - ${runenvtool} ./.ci/buildlib.sh zlib v1.2.5
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng libpng10
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype VER-2-4-9
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libxml2 v2.9.1
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh curl curl-7_12_3
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh tinyxml2 2.0.2
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh SDL2_image release-2.0.0
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_mixer release-2.0.0
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_net release-2.0.0
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_ttf release-2.0.12
-  - ./.ci/copyfinal.sh
-  variables:
-    installname: SDL_default_old
-    runenvtool: /usr/local/spm/env/run${installname}.sh
-    runenvtoolz: /usr/local/spm/env/runzlib_v1.2.5.sh
-  <<: *job-artifacts
-
-SDL_201:
-  stage: build
-  script:
-  - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config cmake
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev
-  - ./.ci/copyspm.sh
-  - ./.ci/buildlib.sh SDL2 release-2.0.1
-  - cp /usr/local/spm/env/runSDL2_release-2.0.1.sh /usr/local/spm/env/runSDL_201.sh
-  - ${runenvtool} ./.ci/buildlib.sh zlib master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libxml2 master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh curl master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh tinyxml2 4.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_image release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_mixer release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_net release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_ttf release-2.0.13
-  - ./.ci/copyfinal.sh
-  variables:
-    installname: SDL_201
-    runenvtool: /usr/local/spm/env/run${installname}.sh
-    runenvtoolz: /usr/local/spm/env/runzlib_master.sh
-  <<: *job-artifacts
-
-SDL_202:
-  stage: build
-  script:
-  - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config cmake
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev
-  - ./.ci/copyspm.sh
-  - ./.ci/buildlib.sh SDL2 release-2.0.2
-  - cp /usr/local/spm/env/runSDL2_release-2.0.2.sh /usr/local/spm/env/runSDL_202.sh
-  - ${runenvtool} ./.ci/buildlib.sh zlib master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libxml2 master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh curl master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh tinyxml2 4.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_image release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_mixer release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_net release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_ttf release-2.0.13
-  - ./.ci/copyfinal.sh
-  variables:
-    installname: SDL_202
-    runenvtool: /usr/local/spm/env/run${installname}.sh
-    runenvtoolz: /usr/local/spm/env/runzlib_master.sh
-  <<: *job-artifacts
-
-SDL_203:
-  stage: build
-  script:
-  - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config cmake
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev
-  - ./.ci/copyspm.sh
-  - ./.ci/buildlib.sh SDL2 release-2.0.3
-  - cp /usr/local/spm/env/runSDL2_release-2.0.3.sh /usr/local/spm/env/runSDL_203.sh
-  - ${runenvtool} ./.ci/buildlib.sh zlib master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libxml2 master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh curl master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh tinyxml2 4.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_image release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_mixer release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_net release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_ttf release-2.0.13
-  - ./.ci/copyfinal.sh
-  variables:
-    installname: SDL_203
-    runenvtool: /usr/local/spm/env/run${installname}.sh
-    runenvtoolz: /usr/local/spm/env/runzlib_master.sh
-  <<: *job-artifacts
-
-SDL_204:
-  stage: build
-  script:
-  - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config cmake
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev
-  - ./.ci/copyspm.sh
-  - ./.ci/buildlib.sh SDL2 release-2.0.4
-  - cp /usr/local/spm/env/runSDL2_release-2.0.4.sh /usr/local/spm/env/runSDL_204.sh
-  - ${runenvtool} ./.ci/buildlib.sh zlib master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libxml2 master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh curl master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh tinyxml2 4.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_image release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_mixer release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_net release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_ttf release-2.0.14
-  - ./.ci/copyfinal.sh
-  variables:
-    installname: SDL_204
-    runenvtool: /usr/local/spm/env/run${installname}.sh
-    runenvtoolz: /usr/local/spm/env/runzlib_master.sh
-  <<: *job-artifacts
-
-SDL_205:
-  stage: build
-  script:
-  - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config cmake
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev
-  - ./.ci/copyspm.sh
-  - ./.ci/buildlib.sh SDL2 release-2.0.5
-  - cp /usr/local/spm/env/runSDL2_release-2.0.5.sh /usr/local/spm/env/runSDL_205.sh
-  - ${runenvtool} ./.ci/buildlib.sh zlib master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libxml2 master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh curl master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh tinyxml2 4.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_image release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_mixer release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_net release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_ttf release-2.0.14
-  - ./.ci/copyfinal.sh
-  variables:
-    installname: SDL_205
-    runenvtool: /usr/local/spm/env/run${installname}.sh
-    runenvtoolz: /usr/local/spm/env/runzlib_master.sh
-  <<: *job-artifacts
-
-SDL_206:
-  stage: build
-  script:
-  - ./.ci/install.sh git mercurial bash gcc g++ make autoconf automake autopoint gettext libtool pkg-config cmake
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev
-  - ./.ci/copyspm.sh
-  - ./.ci/buildlib.sh SDL2 release-2.0.6
-  - cp /usr/local/spm/env/runSDL2_release-2.0.6.sh /usr/local/spm/env/runSDL_206.sh
-  - ${runenvtool} ./.ci/buildlib.sh zlib master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libpng master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh freetype master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh libxml2 master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh curl master
-  - ${runenvtool} ${runenvtoolz} ./.ci/buildlib.sh tinyxml2 4.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_image default
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_mixer release-2.0.1
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_net default
-  - ${runenvtool} ./.ci/buildlib.sh SDL2_ttf default
-  - ./.ci/copyfinal.sh
-  variables:
-    installname: SDL_206
-    runenvtool: /usr/local/spm/env/run${installname}.sh
-    runenvtoolz: /usr/local/spm/env/runzlib_master.sh
-  <<: *job-artifacts
-
-
 manaplus_SDL-1.2:
   stage: manaplus
   script:
@@ -410,160 +153,6 @@ manaplus_SDL-1.2:
     - SDL_SDL-1.2
   <<: *job-artifacts
 
-manaplus_default:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: default
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_default
-  <<: *job-artifacts
-
-manaplus_201:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: 201
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_201
-  <<: *job-artifacts
-
-manaplus_202:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: 202
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_202
-  <<: *job-artifacts
-
-manaplus_203:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: 203
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_203
-  <<: *job-artifacts
-
-manaplus_204:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: 204
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_204
-  <<: *job-artifacts
-
-manaplus_205:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: 205
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_205
-  <<: *job-artifacts
-
-manaplus_206:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: 206
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_206
-  <<: *job-artifacts
-
 manaplus_SDL-1.2_test:
   stage: manaplus
   script:
@@ -586,160 +175,6 @@ manaplus_SDL-1.2_test:
     - SDL_SDL-1.2
   <<: *job-artifacts
 
-manaplus_default_test:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     valgrind 
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: default
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_default
-  <<: *job-artifacts
-
-manaplus_201_test:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     valgrind 
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: 201
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_201
-  <<: *job-artifacts
-
-manaplus_202_test:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     valgrind 
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: 202
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_202
-  <<: *job-artifacts
-
-manaplus_203_test:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     valgrind 
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: 203
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_203
-  <<: *job-artifacts
-
-manaplus_204_test:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     valgrind 
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: 204
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_204
-  <<: *job-artifacts
-
-manaplus_205_test:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     valgrind 
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: 205
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_205
-  <<: *job-artifacts
-
-manaplus_206_test:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     valgrind 
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: 206
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_206
-  <<: *job-artifacts
-
 manaplus_SDL-1.2_old:
   stage: manaplus
   script:
@@ -763,29 +198,6 @@ manaplus_SDL-1.2_old:
     - SDL_SDL-1.2_old
   <<: *job-artifacts
 
-manaplus_default_old:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     libjpeg-dev libtiff-dev
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7.sh --with-sdl2
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: default_old
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.5.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_v2.9.1.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_default_old
-  <<: *job-artifacts
-
 manaplus_SDL-1.2_old_test:
   stage: manaplus
   script:
@@ -808,26 +220,3 @@ manaplus_SDL-1.2_old_test:
   dependencies:
     - SDL_SDL-1.2_old
   <<: *job-artifacts
-
-manaplus_default_old_test:
-  stage: manaplus
-  script:
-  - ./.ci/install.sh gcc-7 g++-7 
-                     make autoconf automake autopoint gettext pkg-config 
-                     libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev
-                     valgrind 
-                     libjpeg-dev libtiff-dev
-                     git wget unzip gdb valgrind netcat-openbsd procps
-  - ./.ci/clonesrc.sh
-  - cd cloned
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-manaplusgame --without-dyecmd
-  - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests
-  variables:
-    LIBNAME: SDL
-    LIBVERSION: default_old
-    runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.5.sh
-    runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_v2.9.1.sh
-    POST_CXXFLAGS: "-Wno-undef"
-  dependencies:
-    - SDL_default_old
-  <<: *job-artifacts