Finally packaged up Mac libraries.

flac, glib, gstreamer, gstreamer-plugins, jpeg-6b, liboil,
libpng, libxml, neon, ogg-vorbis, openal, thoera.

6 files changed, 134 insertions, 18 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 100adf6..c89c227 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,16 @@
+2009-11-08  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Finally packaged up Mac libraries.
+          flac, glib, gstreamer, gstreamer-plugins, jpeg-6b, liboil,
+          libpng, libxml, neon, ogg-vorbis, openal, thoera.
+
+          modified:   linden/indra/cmake/GStreamer.cmake
+          modified:   linden/indra/cmake/JPEG.cmake
+          modified:   linden/indra/cmake/OPENAL.cmake
+          modified:   linden/indra/cmake/PNG.cmake
+          modified:   linden/install.xml
+
+
 2009-11-08 McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Attempted to make the Advanced shortcut play nice with Linux in XUI.
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 51e1550..992b61e 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -66,6 +66,11 @@ else (WINDOWS)
 
   if (DARWIN) # Mac
 
+    use_prebuilt_binary(flac)
+    use_prebuilt_binary(liboil)
+    use_prebuilt_binary(neon)
+    use_prebuilt_binary(theora)
+
     find_library( XML2_LIB
       NAMES xml2.2
       PATHS ${ARCH_PREBUILT_DIRS_RELEASE}
diff --git a/linden/indra/cmake/JPEG.cmake b/linden/indra/cmake/JPEG.cmake
index 5d0ee0d..92aa458 100644
--- a/linden/indra/cmake/JPEG.cmake
+++ b/linden/indra/cmake/JPEG.cmake
@@ -12,10 +12,7 @@ else (STANDALONE)
   if (LINUX)
     set(JPEG_LIBRARIES jpeg)
   elseif (DARWIN)
-    set(JPEG_LIBRARIES
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/liblljpeg.a
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/liblljpeg.a
-      )
+    set(JPEG_LIBRARIES jpeg)
   elseif (WINDOWS)
     set(JPEG_LIBRARIES jpeglib_6b)
   endif (LINUX)
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index ad26d4c..71cbd67 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -40,7 +40,7 @@ if (OPENAL)
   # OPENAL_INCLUDE_DIR
 
   if (DARWIN)
-    set(OPENAL_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include/AL")        
+    set(OPENAL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/AL)
   else (DARWIN)
     find_path(OPENAL_INCLUDE_DIR
       NAMES al.h
@@ -85,7 +85,7 @@ if (OPENAL)
 
   find_path(ALUT_INCLUDE_DIR
     NAMES alut.h
-    PATHS ${LIBS_PREBUILT_DIR}/include/AL
+    PATHS ${OPENAL_INCLUDE_DIR}
     )
 
   if (NOT ALUT_INCLUDE_DIR)
diff --git a/linden/indra/cmake/PNG.cmake b/linden/indra/cmake/PNG.cmake
index 4d0b7b2..d08476d 100644
--- a/linden/indra/cmake/PNG.cmake
+++ b/linden/indra/cmake/PNG.cmake
@@ -9,5 +9,5 @@ if (STANDALONE)
 else (STANDALONE)
   use_prebuilt_binary(libpng)
   set(PNG_LIBRARIES png12)
-  set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+  set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (STANDALONE)
diff --git a/linden/install.xml b/linden/install.xml
index 4ccec49..ca21e19 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -371,6 +371,25 @@
           </map>
         </map>
       </map>
+      <key>flac</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2001,2002,2003,2004,2005,2006,2007  Josh Coalson</string>
+        <key>description</key>
+        <string>libFLAC - Free Lossless Audio Codec</string>
+        <key>license</key>
+        <string>xiph-bsd</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>0fc6d13b79a0c806f9d32c00f374de67</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/flac-1.2.1-darwin-20091107.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
       <key>fmod</key>
       <map>
         <key>copyright</key>
@@ -517,9 +536,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>6cc5ce1fafd10299fdb890b3d4c3cf53</string>
+            <string>64a131bae070964de6431e1c7d5e7362</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glib-2.0-darwin-20080817.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/glib-2.12.0-darwin-20091107.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -558,6 +577,13 @@
         <string>lgpl</string>
         <key>packages</key>
         <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>a0e055b52ac5c4dfecb3546f742fda42</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.22-darwin-20091107.tar.bz2</uri>
+          </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
@@ -580,6 +606,13 @@
         <string>lgpl</string>
         <key>packages</key>
         <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>058bd48bca4038473bd39d4fc2fd8731</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-darwin-20091107.tar.bz2</uri>
+          </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
@@ -686,7 +719,7 @@ cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Re
         <key>copyright</key>
         <string>Copyright (c) 2003, Yves Piguet.</string>
         <key>description</key>
-        <string>An open-source JPEG-2000 library; a slower alternative to Kadaku. Used in the open source release </string>
+        <string>JPEG image codec library</string>
         <key>license</key>
         <string>jpeglib</string>
         <key>packages</key>
@@ -694,9 +727,9 @@ cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Re
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>30b12debc3efce275a335b824dda22d2</string>
+            <string>1007ddeeca66145b75055f81462364cd</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-darwin-20080613.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/jpeg-6b-darwin-20091108.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -769,6 +802,28 @@ anguage Infrstructure (CLI) international standard</string>
           </map>
         </map>
       </map>
+      <key>liboil</key>
+      <map>
+        <key>copyright</key>
+        <string>Portions copyright 2002,2003,2004,2005 David A. Schleef &lt;ds@schleef.org&gt;
+Portions copyright Motorola, Inc. 2003
+Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
+</string>
+        <key>license</key>
+        <string>liboil</string>
+        <key>description</key>
+        <string>Optimized Inner Loops library</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>23c41164df134e50c887ded186f8144e</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/liboil-0.3.15-darwin-20091107.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
       <key>libpng</key>
       <map>
         <key>copyright</key>
@@ -782,9 +837,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>edd0877544dab4c521473279ed237dcc</string>
+            <string>13fd90d50a0bd7ea9b8c8db5bf97cc5e</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.18-darwin-20080812.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/libpng-1.2.35-darwin-20091107.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -881,6 +936,13 @@ anguage Infrstructure (CLI) international standard</string>
         <string>mit</string>
         <key>packages</key>
         <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>d48a1680e60496bf3324d3fd2e11d8a8</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/libxml-2.6.27-darwin-20091107.tar.bz2</uri>
+          </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
@@ -1016,6 +1078,33 @@ anguage Infrstructure (CLI) international standard</string>
           </map>
         </map>
       </map>
+      <key>neon</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (C) 1999-2006 Joe Orton &lt;joe@manyfish.co.uk&gt;
+Portions are:
+Copyright (C) 1999-2000 Tommi Komulainen &lt;Tommi.Komulainen@iki.fi&gt;
+Copyright (C) 1999-2000 Peter Boos &lt;pedib@colorfullife.com&gt;
+Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+Copyright (C) 2004 Aleix Conchillo Flaque &lt;aleix@member.fsf.org&gt;
+Copyright (C) 2004 Jiang Lei &lt;tristone@deluxe.ocn.ne.jp&gt;
+Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
+</string>
+        <key>description</key>
+        <string>HTTP and WebDAV client library</string>
+        <key>license</key>
+        <string>lgpl</string>
+        <key>packages</key>
+        <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>06fbae603d942f22445b265009e65d10</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/neon-darwin-20091108.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
       <key>ndofdev</key>
       <map>
         <key>copyright</key>
@@ -1062,9 +1151,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>a6843398b780645c4897c9776c688926</string>
+            <string>ae91786e70ddf85caed4f6d3f249f86c</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-darwin-20080812.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/ogg-vorbis-darwin-20091108.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -1102,9 +1191,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>f30b851e089108978c8218295a405159</string>
+            <string>f20924232e2ecc8ba351e3819b178e6e</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/openal-darwin-20090418.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/openal-darwin-20091107.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -1267,6 +1356,13 @@ anguage Infrstructure (CLI) international standard</string>
         <string>xiph-bsd</string>
         <key>packages</key>
         <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>ba438bfe25ada5c7be7051f9a91ca300</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/theora-1.0alpha5-darwin-20091107.tar.bz2</uri>
+          </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
@@ -1584,6 +1680,11 @@ Cass Everitt - cass@r3.nu
         <key>text</key>
         <string>http://www.libpng.org/pub/png/src/libpng-LICENSE.txt</string>
       </map>
+      <key>liboil</key>
+      <map>
+        <key>url</key>
+        <string>http://cgit.freedesktop.org/liboil/tree/COPYING</string>
+      </map>
       <key>linden</key>
       <map>
         <key>text</key>