From 211b2c2dcd16f128d3be1a8832a101d3e231855b Mon Sep 17 00:00:00 2001
From: Nicky <sl.nicky.ml@googlemail.com>
Date: Wed, 6 May 2015 18:57:48 +0200
Subject: [PATCH] - Enable growl, set the right pkg urls, change the name to
 gntp-growl so autobuild does not try to install the package multiple times. -
 Update boost and colladom for win32.

---
 autobuild.xml             | 20 ++++++++++----------
 indra/cmake/Growl.cmake   | 10 +++++-----
 package_override_vc12.ini |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 80e79769f5..2575b0b0ec 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -63,16 +63,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>d8fdf76fbeda3bcd592759780fd3cbe1</string>
+              <string>7ffe5a6165e6808e0674754b56545034</string>
               <key>url</key>
-              <string>http://downloads.phoenixviewer.com/ndPhysicsStub-r65-win32.tar.bz2</string>
+              <string>http://downloads.phoenixviewer.com/ndPhysicsStub-1.0-windows-201505061845-r74.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
           </map>
         </map>
       </map>
-      <key>Growl</key>
+      <key>gntp-growl</key>
       <map>
         <key>copyright</key>
         <string>The Growl Project</string>
@@ -81,7 +81,7 @@
         <key>license</key>
         <string>bsd</string>
         <key>name</key>
-        <string>Growl</string>
+        <string>gntp-growl</string>
         <key>platforms</key>
         <map>
           <key>darwin</key>
@@ -346,9 +346,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>76a607d8a625062b9a63a88b62819894</string>
+              <string>45f4805a9f58c63e5bcb16b0f3fe962e</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/boost_3p-update-boost/rev/297445/arch/CYGWIN/installer/boost-1.57-windows-297445.tar.bz2</string>
+              <string>http://downloads.phoenixviewer.com/boost-1.57-windows-201505061806-r134.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -398,9 +398,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>220897a1893a188aa9d31efb48909878</string>
+              <string>c359a02f6ed2cfb0c683a6318eab976e</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/colladadom_3p-update-colladadom/rev/297450/arch/CYGWIN/installer/colladadom-2.3.297450-windows-297450.tar.bz2</string>
+              <string>http://downloads.phoenixviewer.com/3p-colladadom\colladadom-2.3.201505061818-r95-windows-201505061818-r95.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -2535,13 +2535,13 @@
       <key>copyright</key>
       <string>Copyright (c) 2014, Linden Research, Inc.</string>
       <key>description</key>
-      <string>Second Life Viewer</string>
+      <string>Firestorm Viewer</string>
       <key>license</key>
       <string>LGPL</string>
       <key>license_file</key>
       <string>docs/LICENSE-source.txt</string>
       <key>name</key>
-      <string>Second Life Viewer</string>
+      <string>firestorm</string>
       <key>platforms</key>
       <map>
         <key>common</key>
diff --git a/indra/cmake/Growl.cmake b/indra/cmake/Growl.cmake
index 6ad3644c24..47d575c2a3 100644
--- a/indra/cmake/Growl.cmake
+++ b/indra/cmake/Growl.cmake
@@ -13,11 +13,11 @@ if (USESYSTEMLIBS)
 else (USESYSTEMLIBS)
     if (DARWIN OR WINDOWS)
 	# Growl is making some problems still
-#      include(Prebuilt)
-#      use_prebuilt_binary(Growl)
-#      set(GROWL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/Growl)
-#      set(GROWL_LIBRARY growl++)
-#      add_definitions( -DHAS_GROWL)
+      include(Prebuilt)
+      use_prebuilt_binary(gntp-growl)
+      set(GROWL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/Growl)
+      set(GROWL_LIBRARY growl++)
+      add_definitions( -DHAS_GROWL)
 	elseif (LINUX)
       add_definitions( -DHAS_GROWL)
     endif ()
diff --git a/package_override_vc12.ini b/package_override_vc12.ini
index f5011d3040..e9a7dad812 100644
--- a/package_override_vc12.ini
+++ b/package_override_vc12.ini
@@ -110,5 +110,5 @@ windows = http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-met
 ;[glext]
 ;windows = http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glext-68-windows-20110406.tar.bz2|5de58ca0fe19abf68b25956762ee0d29
 
-[Growl]
+[gntp_growl]
 windows=http://downloads.phoenixviewer.com/gntp_growl-1.0-windows-x64-201505061407-r10.tar.bz2|200b03904b5e8559e45039eb70aa2a45