Browse Source

update OpenSSL to 1.0.2j and libpng to 1.6.26

Ashish Kulkarni 8 years ago
parent
commit
b8616163f4
2 changed files with 8 additions and 5 deletions
  1. 2 1
      CHANGELOG.md
  2. 6 4
      scripts/build.py

+ 2 - 1
CHANGELOG.md

@@ -1,6 +1,7 @@
 v0.12.4 (unreleased)
 --------------------
-* update OpenSSL to 1.0.2h
+* add support for building with VS2015
+* update OpenSSL to 1.0.2j and libpng to 1.6.26
 * **[qt]** change screen size in headless mode to a more sane value (1366x768)
 * **[qt]** allow screen size in headless mode to be overriden via environment variables
 * **[qt]** fix compilation failure on OS X 10.11 due to usage of deprecated APIs

+ 6 - 4
scripts/build.py

@@ -271,8 +271,8 @@ enabled=1
 DEPENDENT_LIBS = {
     'openssl': {
         'order' : 1,
-        'url'   : 'https://openssl.org/source/openssl-1.0.2h.tar.gz',
-        'sha1'  : '577585f5f5d299c44dd3c993d3c0ac7a219e4949',
+        'url'   : 'https://openssl.org/source/openssl-1.0.2j.tar.gz',
+        'sha1'  : 'bdfbdb416942f666865fa48fe13c2d0e588df54f',
         'build' : {
             'msvc*-win32*': {
                 'result': ['include/openssl/ssl.h', 'lib/ssleay32.lib', 'lib/libeay32.lib'],
@@ -328,13 +328,14 @@ DEPENDENT_LIBS = {
 
     'libpng': {
         'order' : 3,
-        'url' : 'http://downloads.sourceforge.net/libpng/libpng-1.2.56.tar.gz',
-        'sha1': '9619a20e1bfc34edfbc4931a632a2d6a2c8a9fbc',
+        'url' : 'http://downloads.sourceforge.net/libpng/libpng-1.6.26.tar.gz',
+        'sha1': '3b2652f89b8fdcb6c29e9ed7642dfcfc0bbcf17e',
         'build' : {
             'msvc*': {
                 'result': {
                     'include/png.h'       : 'png.h',
                     'include/pngconf.h'   : 'pngconf.h',
+                    'include/pnglibconf.h': 'pnglibconf.h',
                     'lib/libpng.lib'      : 'libpng.lib'
                 },
                 'replace': [
@@ -347,6 +348,7 @@ DEPENDENT_LIBS = {
                 'result': {
                     'include/png.h'       : 'png.h',
                     'include/pngconf.h'   : 'pngconf.h',
+                    'include/pnglibconf.h': 'pnglibconf.h',
                     'lib/libpng.a'        : 'libpng.a'
                 },
                 'replace': [