From 60e1fc70d28594920dcbaa9c41e9d532211e8073 Mon Sep 17 00:00:00 2001
From: Bastien Montagne <montagne29@wanadoo.fr>
Date: Fri, 27 Sep 2013 13:56:16 +0000
Subject: install_deps.sh fix: add explicit OGG lib handling, we need it to
 pass correct values for ffmpeg libraries (at least for static builds).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I’m not close to understand why this has worked fine until today... :/

Only tested with Debian, but I would not expect any issue with Fedora/Suse/Arch, this is a quite simple change!
---
 build_files/build_environment/install_deps.sh | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'build_files/build_environment')

diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 34cba73d0bf..14e1baf4fd4 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -247,6 +247,8 @@ _ffmpeg_list_sep=";"
 # FFMPEG optional libs.
 VORBIS_USE=false
 VORBIS_DEV=""
+OGG_USE=false
+OGG_DEV=""
 THEORA_USE=false
 THEORA_DEV=""
 XVID_USE=false
@@ -1890,16 +1892,18 @@ install_DEB() {
   # These libs should always be available in debian/ubuntu official repository...
   OPENJPEG_DEV="libopenjpeg-dev"
   VORBIS_DEV="libvorbis-dev"
+  OGG_DEV="libogg-dev"
   THEORA_DEV="libtheora-dev"
 
   _packages="gawk cmake cmake-curses-gui scons build-essential libjpeg-dev libpng-dev \
              libfreetype6-dev libx11-dev libxi-dev wget libsqlite3-dev libbz2-dev \
              libncurses5-dev libssl-dev liblzma-dev libreadline-dev $OPENJPEG_DEV \
-             libopenal-dev libglew-dev yasm $THEORA_DEV $VORBIS_DEV \
+             libopenal-dev libglew-dev yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV \
              libsdl1.2-dev libfftw3-dev patch bzip2"
 
   OPENJPEG_USE=true
   VORBIS_USE=true
+  OGG_USE=true
   THEORA_USE=true
 
   # Install newest libtiff-dev in debian/ubuntu.
@@ -2307,15 +2311,17 @@ install_RPM() {
   # These libs should always be available in fedora/suse official repository...
   OPENJPEG_DEV="openjpeg-devel"
   VORBIS_DEV="libvorbis-devel"
+  OGG_DEV="libogg-devel"
   THEORA_DEV="libtheora-devel"
 
   _packages="gcc gcc-c++ make scons libtiff-devel freetype-devel libjpeg-devel\
              libpng-devel libX11-devel libXi-devel wget ncurses-devel \
              readline-devel $OPENJPEG_DEV openal-soft-devel \
-             glew-devel yasm $THEORA_DEV $VORBIS_DEV patch"
+             glew-devel yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV patch"
 
   OPENJPEG_USE=true
   VORBIS_USE=true
+  OGG_USE=true
   THEORA_USE=true
 
   if [ $RPM = "FEDORA" -o $RPM = "RHEL" ]; then
@@ -2643,13 +2649,15 @@ install_ARCH() {
   # These libs should always be available in arch official repository...
   OPENJPEG_DEV="openjpeg"
   VORBIS_DEV="libvorbis"
+  OGG_DEV="libogg"
   THEORA_DEV="libtheora"
 
   _packages="base-devel scons cmake libxi glew libpng libtiff wget openal \
-             $OPENJPEG_DEV $VORBIS_DEV $THEORA_DEV yasm sdl fftw"
+             $OPENJPEG_DEV $VORBIS_DEV $OGG_DEV $THEORA_DEV yasm sdl fftw"
 
   OPENJPEG_USE=true
   VORBIS_USE=true
+  OGG_USE=true
   THEORA_USE=true
 
   if $WITH_ALL; then
@@ -2912,6 +2920,10 @@ print_info_ffmpeglink() {
     _packages="$_packages $VORBIS_DEV"
   fi
 
+  if $OGG_USE; then
+    _packages="$_packages $OGG_DEV"
+  fi
+
   if $XVID_USE; then
     _packages="$_packages $XVID_DEV"
   fi
-- 
cgit v1.2.3