From b5026453501d36cb2d2097dc1aa09623bfa8c0f8 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 19 Jun 2015 11:13:26 +1000 Subject: [PATCH 1/3] Removed unnecessary comments --- winbuild/config.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/winbuild/config.py b/winbuild/config.py index b237703f3..292bd6a1f 100644 --- a/winbuild/config.py +++ b/winbuild/config.py @@ -27,17 +27,12 @@ libs = { 'zlib':{ 'hash': 'md5:dd70349cedb3981371686e1c9b89a7f9', # not found - generated by wiredfool 'dir': 'tiff-4.0.3', }, -# 'freetype':{ -# 'url':'http://download.savannah.gnu.org/releases/freetype/ft253.zip', -# 'hash': 'md5:b3858f7e69740ac04ef53366aeb172bc', # not found - generated by wiredfool -# 'dir': 'freetype-2.5.3', -# }, -'freetype':{ + 'freetype':{ 'url': 'http://download.savannah.gnu.org/releases/freetype/freetype-2.6.tar.gz', 'hash':'md5:1d733ea6c1b7b3df38169fbdbec47d2b', 'dir': 'freetype-2.6', }, -'lcms':{ + 'lcms':{ 'url':SF_MIRROR+'/project/lcms/lcms/2.6/lcms2-2.6.zip', 'hash': 'sha1:eea25f001246fa2e6b242ac456cecff7483cf061', 'dir': 'lcms2-2.6', @@ -57,12 +52,6 @@ libs = { 'zlib':{ 'hash':'sha1:326c4b6787a01e5e32a9b30bae76442d18d2d1b6', 'dir':'libwebp-0.4.0', }, -# 'openjpeg':{ -# 'url':'https://openjpeg.googlecode.com/files/openjpeg-2.0.0.tar.gz', -# 'hash':'sha1:0af78ab2283b43421458f80373422d8029a9f7a7', -# 'dir':'openjpeg-2.0.0', -# }, - 'openjpeg':{ 'url':SF_MIRROR+'/project/openjpeg/openjpeg/2.1.0/openjpeg-2.1.0.tar.gz', 'hash':'md5:f6419fcc233df84f9a81eb36633c6db6', From c870ee3d62e902a746690ca59e53fa41e2191367 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 19 Jun 2015 11:25:52 +1000 Subject: [PATCH 2/3] Removed alternate mirror --- winbuild/config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/winbuild/config.py b/winbuild/config.py index 292bd6a1f..f3939e929 100644 --- a/winbuild/config.py +++ b/winbuild/config.py @@ -1,6 +1,5 @@ import os -SF_MIRROR = 'http://hivelocity.dl.sourceforge.net' SF_MIRROR = 'http://iweb.dl.sourceforge.net' pythons = {#'26':7, From 4a8242970852120aa590dd1bf2b37adec3a73bb0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 19 Jun 2015 11:26:34 +1000 Subject: [PATCH 3/3] Updated libwebp and lcms2 versions --- winbuild/config.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/winbuild/config.py b/winbuild/config.py index f3939e929..73cab99ae 100644 --- a/winbuild/config.py +++ b/winbuild/config.py @@ -32,9 +32,9 @@ libs = { 'zlib':{ 'dir': 'freetype-2.6', }, 'lcms':{ - 'url':SF_MIRROR+'/project/lcms/lcms/2.6/lcms2-2.6.zip', - 'hash': 'sha1:eea25f001246fa2e6b242ac456cecff7483cf061', - 'dir': 'lcms2-2.6', + 'url':SF_MIRROR+'/project/lcms/lcms/2.7/lcms2-2.7.zip', + 'hash': 'sha1:7ff1a5b721ca719760ba6eb4ec6f38d5e65381cf', + 'dir': 'lcms2-2.7', }, 'tcl':{ 'url':SF_MIRROR+'/project/tcl/Tcl/8.5.13/tcl8513-src.zip', @@ -47,9 +47,9 @@ libs = { 'zlib':{ 'dir': '', }, 'webp':{ - 'url':'https://webp.googlecode.com/files/libwebp-0.4.0.tar.gz', - 'hash':'sha1:326c4b6787a01e5e32a9b30bae76442d18d2d1b6', - 'dir':'libwebp-0.4.0', + 'url':'http://downloads.webmproject.org/releases/webp/libwebp-0.4.3.tar.gz', + 'hash':'sha1:1c307a61c4d0018620b4ba9a58e8f48a8d6640ef', + 'dir':'libwebp-0.4.3', }, 'openjpeg':{ 'url':SF_MIRROR+'/project/openjpeg/openjpeg/2.1.0/openjpeg-2.1.0.tar.gz',