From a0487b12bede79817dd701969fbbddbce1ed80c0 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Thu, 29 Jan 2015 00:55:08 -0600
Subject: [PATCH] FMOD Studio prebuilt update for OSX. Also, delete
 "autobuild-package.xml" that is in newer v3-based prebuilt packages, and
 prevent registry key from trumping usage of fmodstudio prebuilt; it must now
 be explicitly set in the develop.py invocation.

---
 indra/cmake/FMODSTUDIO.cmake |  8 ++++----
 indra/newview/CMakeLists.txt |  4 ++--
 install.xml                  |  4 ++--
 scripts/install.py           | 13 ++++++++++---
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake
index 0939540f4..fac23b3d3 100644
--- a/indra/cmake/FMODSTUDIO.cmake
+++ b/indra/cmake/FMODSTUDIO.cmake
@@ -14,12 +14,12 @@ set(FMOD_EXTERNAL_LIB OFF)
 
 if(STANDALONE OR WINDOWS)
   if (NOT FMODSTUDIO_SDK_DIR AND WINDOWS)
-    GET_FILENAME_COMPONENT(REG_DIR [HKEY_CURRENT_USER\\Software\\FMOD\ Studio\ API\ Windows] ABSOLUTE)
-    set(FMODSTUDIO_SDK_DIR ${REG_DIR} CACHE PATH "Path to the FMOD Studio SDK." FORCE)
+    #GET_FILENAME_COMPONENT(REG_DIR [HKEY_CURRENT_USER\\Software\\FMOD\ Studio\ API\ Windows] ABSOLUTE)
+    #set(FMODSTUDIO_SDK_DIR ${REG_DIR} CACHE PATH "Path to the FMOD Studio SDK." FORCE)
   endif (NOT FMODSTUDIO_SDK_DIR AND WINDOWS)
-  if(NOT FMODSTUDIO_SDK_DIR)
+  if(NOT FMODSTUDIO_SDK_DIR AND STANDALONE)
     message(FATAL_ERROR "FMODSTUDIO_SDK_DIR not set!")
-  endif(NOT FMODSTUDIO_SDK_DIR)
+  endif(NOT FMODSTUDIO_SDK_DIR AND STANDALONE)
 endif(STANDALONE OR WINDOWS)
 
 if(FMODSTUDIO_SDK_DIR)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index faed997b0..e40624d2e 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1430,12 +1430,12 @@ if(FMOD_LIBRARY_RELEASE)
                      COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<$<NOT:$<CONFIG:debug>>:${FMOD_LIBRARY_RELEASE}>$<$<CONFIG:debug>:${FMOD_LIBRARY_DEBUG}>" "${CMAKE_CFG_INTDIR}/$<$<NOT:$<CONFIG:debug>>:${fmod_lib_rel_name}>$<$<CONFIG:debug>:${fmod_lib_deb_name}>" 				
                      DEPENDS "${FMOD_LIBRARY_RELEASE}")
   add_custom_target(fmod_lib_copy DEPENDS fmod_lib.marker prepare)
-  if(DARWIN)
+  if(DARWIN AND FMOD_EXTERNAL_LIB)
     add_custom_command(OUTPUT fmod_lib_install.marker
 	  	               COMMAND install_name_tool -id "@executable_path/../Resources/$<$<NOT:$<CONFIG:debug>>:${fmod_lib_rel_name}>$<$<CONFIG:debug>:${FMOD_LIBRARY_DEBUG}>" "${CMAKE_CFG_INTDIR}/$<$<NOT:$<CONFIG:debug>>:${fmod_lib_rel_name}>$<$<CONFIG:debug>:${fmod_lib_deb_name}>"
                        DEPENDS fmod_lib.marker)
     add_dependencies(fmod_lib_copy fmod_lib_install.marker)
-  endif(DARWIN)
+  endif(DARWIN AND FMOD_EXTERNAL_LIB)
   add_dependencies(${VIEWER_BINARY_NAME} fmod_lib_copy)
 
   #viewer_manifest.py needs these libraries (for now its all dylib)
diff --git a/install.xml b/install.xml
index 055d6ca05..807c7ed69 100644
--- a/install.xml
+++ b/install.xml
@@ -464,9 +464,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>93ebcfcaf0572427593cdb38d7c7435b</string>
+            <string>1af152ce79422c791ccc6e04571b41d7</string>
             <key>url</key>
-            <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/fmodstudio-1.05.09-darwin-20150106.tar.bz2</uri>
+            <uri>https://bitbucket.org/alchemyviewer/publiclibs-darwin/downloads/fmodstudio-1.05.11-darwin-201501281806.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
diff --git a/scripts/install.py b/scripts/install.py
index f43bc8dae..6bb9eaacb 100755
--- a/scripts/install.py
+++ b/scripts/install.py
@@ -572,9 +572,16 @@ windows/i686/vs/2003 -- specify a windows visual studio 2003 package"""
                 except AttributeError:
                     _extractall(tar, path=install_dir)
             symlinks = []
+
+            filenames = tar.getnames()
+            if('autobuild-package.xml' in filenames):
+                filenames.remove("autobuild-package.xml")
+                rem_file = os.path.join(install_dir, "autobuild-package.xml")
+                if os.path.exists(rem_file):
+                    os.remove(rem_file)
             if _get_platform() == 'linux' or _get_platform() == 'linux64':
                 first = 1
-                for tfile in tar.getnames():
+                for tfile in filenames:
                     if tfile.find('.so.') > 0:
                         LINK = re.sub(r'\.so\.[0-9.]*$', '.so', tfile)
                         link_name = install_dir + "/" + LINK
@@ -600,14 +607,14 @@ windows/i686/vs/2003 -- specify a windows visual studio 2003 package"""
             if ifile.pkgname in self._installed:
                 self._installed[ifile.pkgname].add_files(
                     ifile.url,
-                    tar.getnames() + symlinks)
+                    filenames + symlinks)
                 self._installed[ifile.pkgname].set_md5sum(
                     ifile.url,
                     ifile.md5sum)
             else:
                 # *HACK: this understands the installed package syntax.
                 definition = { ifile.url :
-                               {'files': tar.getnames() + symlinks,
+                               {'files': filenames + symlinks,
                                 'md5sum' : ifile.md5sum } }
                 self._installed[ifile.pkgname] = InstalledPackage(definition)
             self._installed_changed = True