From fcdd82af83093a0e62200be7b1fc44e96fd76d57 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Fri, 11 Mar 2011 23:50:00 +0000
Subject: [PATCH] update libpng archive for linux.
---
autobuild.xml | 4 ++--
indra/cmake/PNG.cmake | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index ab98824d567..b5c48948416 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1016,9 +1016,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>adeeca61be1b8f47ce85660c8c20a904</string>
+ <string>0681ab7e1988dfdbdad7dd9edb7760ee</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-linux-20100929.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-libpng/rev/221851/arch/Linux/installer/libpng-1.5.1-linux-20110223.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index 60f749869a3..913c5756727 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -15,7 +15,7 @@ else (STANDALONE)
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)
+ set(PNG_LIBRARIES png15)
+ set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng15)
endif()
endif (STANDALONE)
--
GitLab