From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 13 Mar 2016 01:38:00 +0000 (+0000)
Subject: Xonotic's travis script: Build the Linux binaries against SDL 2.0.4.
X-Git-Tag: xonotic-v0.8.2~49
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d21b48545a2ce90e17ec20d68e8e70b9411e4fc0;p=xonotic%2Fdarkplaces.git

Xonotic's travis script: Build the Linux binaries against SDL 2.0.4.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12249 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=d85d3ae5246bd89abc0f6c77b2de80313a153f1b
---

diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh
index 8d8ce4d6..5ed56f85 100755
--- a/.travis-before_install-xonotic.sh
+++ b/.travis-before_install-xonotic.sh
@@ -24,10 +24,10 @@ for os in "$@"; do
       # Now install our dependencies.
       sudo i386 chroot "$chroot" apt-get install -y \
         libxpm-dev libsdl1.2-dev libxxf86vm-dev
-      wget https://www.libsdl.org/release/SDL2-2.0.3.tar.gz
-      tar xf SDL2-2.0.3.tar.gz
+      wget https://www.libsdl.org/release/SDL2-2.0.4.tar.gz
+      tar xf SDL2-2.0.4.tar.gz
       (
-      cd SDL2-2.0.3
+      cd SDL2-2.0.4
       sudo i386 chroot "$chroot" sh -c "cd $PWD && ./configure --enable-static --disable-shared"
       sudo i386 chroot "$chroot" make -C "$PWD"
       sudo i386 chroot "$chroot" make -C "$PWD" install
@@ -36,10 +36,10 @@ for os in "$@"; do
     linux64)
       sudo apt-get install -y \
         libxpm-dev libsdl1.2-dev libxxf86vm-dev
-      wget https://www.libsdl.org/release/SDL2-2.0.3.tar.gz
-      tar xf SDL2-2.0.3.tar.gz
+      wget https://www.libsdl.org/release/SDL2-2.0.4.tar.gz
+      tar xf SDL2-2.0.4.tar.gz
       (
-      cd SDL2-2.0.3
+      cd SDL2-2.0.4
       ./configure --enable-static --disable-shared
       make
       sudo make install