[ioquake3] 10/33: Enable Ogg Vorbis support by default

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 414f3c5e3e2fd95eb59f28d0f94269bf201417c7
Author: Zack Middleton <zack at cloemail.com>
Date:   Sat Sep 23 19:55:49 2017 -0500

    Enable Ogg Vorbis support by default
    
    libvorbis is included in-tree so this doesn't require additional
    dependencies.
---
 .travis.yml         | 4 ++--
 Makefile            | 2 +-
 jenkins-ci-build.sh | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 77c6901..2281b98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,8 @@ env:
     - CC=gcc
     - CC=clang
     # extra libs
-    - CC=gcc USE_CODEC_VORBIS=1 USE_FREETYPE=1
-    - CC=clang USE_CODEC_VORBIS=1 USE_FREETYPE=1
+    - CC=gcc USE_FREETYPE=1
+    - CC=clang USE_FREETYPE=1
     # cross-compile using mingw
     # dlopen curl to workaround link error because mingw-w64 in trusty is missing strtok_r required by libcurl.a
     - CC= PLATFORM="mingw32" ARCH="x86" USE_CURL_DLOPEN=1
diff --git a/Makefile b/Makefile
index 44d2862..dc40a65 100644
--- a/Makefile
+++ b/Makefile
@@ -176,7 +176,7 @@ ifndef USE_CURL_DLOPEN
 endif
 
 ifndef USE_CODEC_VORBIS
-USE_CODEC_VORBIS=0
+USE_CODEC_VORBIS=1
 endif
 
 ifndef USE_CODEC_OPUS
diff --git a/jenkins-ci-build.sh b/jenkins-ci-build.sh
index 31bdd97..e28c80a 100755
--- a/jenkins-ci-build.sh
+++ b/jenkins-ci-build.sh
@@ -8,7 +8,6 @@ cd ${MASTER_DIR}
 
 if [ "${OPTIONS}" == "all_options" ];
 then
-	export USE_CODEC_VORBIS=1
 	export USE_FREETYPE=1
 fi
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git