From b8d07a9439ff21fce8ae2405db3aa38dd3d9fc14 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 18 Nov 2009 04:11:55 -0600
Subject: Added Linux package for liboil 0.3.16.

It's needed by some GStreamer plugins.
---
 ChangeLog.txt                           | 8 ++++++++
 linden/indra/cmake/GStreamer.cmake      | 1 +
 linden/indra/newview/viewer_manifest.py | 1 +
 linden/install.xml                      | 7 +++++++
 4 files changed, 17 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f9581cc..34d21ad 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,13 @@
 2009-11-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* Added Linux package for liboil 0.3.16.
+	  It's needed by some GStreamer plugins.
+
+	  modified:   linden/indra/cmake/GStreamer.cmake
+	  modified:   linden/indra/newview/viewer_manifest.py
+	  modified:   linden/install.xml
+
+
 	* VWR-12620: Linux compile fails with -O2 (--type=Release)
 	  Patch by Alissa Sabre.
 
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 992b61e..55a8f43 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -97,6 +97,7 @@ else (WINDOWS)
 
   else (DARWIN) # Linux
 
+    use_prebuilt_binary(liboil)
     use_prebuilt_binary(theora)
 
     set(GSTREAMER_LIBRARIES
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 798eab1..e729db0 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -839,6 +839,7 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libtheora.so.0")
             self.path("libvorbis.so.0")
             self.path("libvorbisenc.so.2")
+            self.path("liboil-0.3.so.0")
 
             # Gstreamer plugins
             if self.prefix("gstreamer-plugins"):
diff --git a/linden/install.xml b/linden/install.xml
index 69e928a..75744da 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -822,6 +822,13 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/liboil-0.3.15-darwin-20091107.tar.bz2</uri>
           </map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>5ab0f986317b1a5c4f1682ad1972c318</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/liboil-0.3.16-linux-20091118.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>libpng</key>
-- 
cgit v1.1