summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--autobuild.xml32
-rw-r--r--indra/cmake/JPEG.cmake2
-rw-r--r--indra/cmake/OpenSSL.cmake2
-rw-r--r--indra/cmake/PNG.cmake3
-rw-r--r--indra/llaudio/llaudiodecodemgr.cpp8
5 files changed, 28 insertions, 19 deletions
diff --git a/autobuild.xml b/autobuild.xml
index 1b7627fb37..513cb76b5f 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -836,9 +836,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>d94de5a98492018144b95a8022ed4e44</string>
+ <string>71bd6efbf508e1f2e7d98a6195a93e9e</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jpeglib/rev/222232/arch/Darwin/installer/jpeglib-8c-darwin-20110228.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -980,9 +980,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>4aa623811aff42df702e8d3fdd848ac3</string>
+ <string>6fe1adf12d98bce9111f60ee762007b9</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libpng/rev/221851/arch/Darwin/installer/libpng-1.5.1-darwin-20110222.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1196,9 +1196,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>510c88fb183556b8c5fba25eb0c3d85e</string>
+ <string>57f32a1a670f06a4dc036eb1164ad9d7</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.03-1.1.2-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ogvorbis/rev/221801/arch/Darwin/installer/ogg_vorbis-1.1.3-1.2.0-darwin-20110222.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1244,9 +1244,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>9cf8e84cb91996616cf627ad18c85442</string>
+ <string>facee34b8bd57ad602157e65a5af1a49</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8l-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/220986/arch/Darwin/installer/openssl-0.9.8q-darwin-20110211.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1332,9 +1332,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>972088359b9472a3baf4dda695cbda44</string>
+ <string>4be51c7cca7d84831e30b63279df7ae5</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openjpeg-1.3.0-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openjpeg/rev/222548/arch/Darwin/installer/openjpeg-1.4-darwin-20110302.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1380,9 +1380,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>d47d121c8eaed4ac6d8253ceda23b5c9</string>
+ <string>2172379794217d0ffba0db09b2ac17bf</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/pth-2.0.7-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-pth/rev/222617/arch/Darwin/installer/pth-2.0.7-darwin-20110303.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1500,9 +1500,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>994193ab308ac40994421ca411249b65</string>
+ <string>a3e0fb4b4a51b01690a99747a1cca531</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-xmlrpc-epi/rev/222889/arch/Darwin/installer/xmlrpc_epi-0.54.1-darwin-20110307.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1548,9 +1548,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>3d1b42e6c3fcfebe00c6b87a0228c0ab</string>
+ <string>49b8de20f3bb43537f51311894a72de1</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.1.4-darwin-20101004.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-zlib/rev/220983/arch/Darwin/installer/zlib-1.2.5-darwin-20110211.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
index 0f0bbb9564..4f99efd602 100644
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -12,7 +12,7 @@ else (STANDALONE)
if (LINUX)
set(JPEG_LIBRARIES jpeg)
elseif (DARWIN)
- set(JPEG_LIBRARIES lljpeg)
+ set(JPEG_LIBRARIES jpeg)
elseif (WINDOWS)
set(JPEG_LIBRARIES jpeglib)
endif (LINUX)
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index c692b67b49..5982ee9a49 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -19,5 +19,5 @@ endif (STANDALONE)
if (LINUX)
set(CRYPTO_LIBRARIES crypto)
elseif (DARWIN)
- set(CRYPTO_LIBRARIES llcrypto)
+ set(CRYPTO_LIBRARIES crypto)
endif (LINUX)
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index 86b7267494..60f749869a 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -11,6 +11,9 @@ else (STANDALONE)
if (WINDOWS)
set(PNG_LIBRARIES libpng15)
set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
+ elseif(DARWIN)
+ set(PNG_LIBRARIES png15)
+ set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
else()
set(PNG_LIBRARIES png12)
set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng12)
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp
index 01dfd03c18..84105ddfca 100644
--- a/indra/llaudio/llaudiodecodemgr.cpp
+++ b/indra/llaudio/llaudiodecodemgr.cpp
@@ -680,4 +680,10 @@ BOOL LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid)
return FALSE;
}
-
+#ifdef LL_DARWIN
+// HACK: to fool the compiler into not emitting unused warnings.
+namespace {
+ const ov_callbacks callback_array[4] = {OV_CALLBACKS_DEFAULT, OV_CALLBACKS_NOCLOSE, OV_CALLBACKS_STREAMONLY,
+ OV_CALLBACKS_STREAMONLY_NOCLOSE};
+}
+#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-03 14:13:43 +0000