Skip to content

Commit

Permalink
Merge pull request #7 from glebm/upd-img
Browse files Browse the repository at this point in the history
Update image libraries from upstream: libpng, libjpeg, web, tiff
  • Loading branch information
pingflood committed Mar 15, 2020
1 parent 2a2dcff commit c59845e
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 140 deletions.
3 changes: 2 additions & 1 deletion package/libjpeg/libjpeg.hash
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# locally computed hash
sha256 240fd398da741669bf3c90366f58452ea59041cacc741a489b99f2f6a0bad052 jpegsrc.v9b.tar.gz
sha256 99cb50e48a4556bc571dadd27931955ff458aae32f68c4d9c39d624693f69c32 jpegsrc.v9d.tar.gz
sha256 3dc4e4a145c907a96bd6a0e40be3f722fecf061951909143cdff5365cba9c78c README
2 changes: 1 addition & 1 deletion package/libjpeg/libjpeg.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

LIBJPEG_VERSION = 9b
LIBJPEG_VERSION = 9d
LIBJPEG_SITE = http://www.ijg.org/files
LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz
LIBJPEG_LICENSE = IJG
Expand Down

This file was deleted.

11 changes: 5 additions & 6 deletions package/libpng/libpng.hash
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# From http://sourceforge.net/projects/libpng/files/libpng16/1.6.34/
md5 c05b6ca7190a5e387b78657dbe5536b2 libpng-1.6.34.tar.xz
sha1 45de4ec996ffcc3e18037e7c128abe95f4d0292a libpng-1.6.34.tar.xz

# From https://sourceforge.net/projects/libpng/files/libpng16/1.6.37/
md5 015e8e15db1eecde5f2eb9eb5b6e59e9 libpng-1.6.37.tar.xz
sha1 3ab93fabbf4c27e1c4724371df408d9a1bd3f656 libpng-1.6.37.tar.xz
# Locally computed:
sha256 2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6 libpng-1.6.34.tar.xz
sha256 a247c24f82bacf0403fe2f3d5550493a91cdb575fe7036b764bda8cacf3efd9c LICENSE
sha256 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca libpng-1.6.37.tar.xz
sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b LICENSE
6 changes: 3 additions & 3 deletions package/libpng/libpng.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
################################################################################

LIBPNG_VERSION = 1.6.34
LIBPNG_VERSION = 1.6.37
LIBPNG_SERIES = 16
LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz
LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION)
LIBPNG_LICENSE = Libpng
LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION)
LIBPNG_LICENSE = Libpng-2.0
LIBPNG_LICENSE_FILES = LICENSE
LIBPNG_INSTALL_STAGING = YES
LIBPNG_DEPENDENCIES = host-pkgconf zlib
Expand Down

This file was deleted.

3 changes: 2 additions & 1 deletion package/tiff/tiff.hash
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# Locally computed
sha256 59d7a5a8ccd92059913f246877db95a2918e6c04fb9d43fd74e5c3390dac2910 tiff-4.0.8.tar.gz
sha256 5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634 tiff-4.1.0.tar.gz
sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7 COPYRIGHT
2 changes: 1 addition & 1 deletion package/tiff/tiff.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

TIFF_VERSION = 4.0.8
TIFF_VERSION = 4.1.0
TIFF_SITE = http://download.osgeo.org/libtiff
TIFF_LICENSE = tiff license
TIFF_LICENSE_FILES = COPYRIGHT
Expand Down
2 changes: 1 addition & 1 deletion package/webp/webp.hash
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Locally calculated
sha256 06503c782d9f151baa325591c3579c68ed700ffc62d4f5a32feead0ff017d8ab libwebp-0.6.1.tar.gz
sha256 98a052268cc4d5ece27f76572a7f50293f439c17a98e67c4ea0c7ed6f50ef043 libwebp-1.1.0.tar.gz
sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING
2 changes: 1 addition & 1 deletion package/webp/webp.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

WEBP_VERSION = 0.6.1
WEBP_VERSION = 1.1.0
WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz
WEBP_SITE = http://downloads.webmproject.org/releases/webp
WEBP_LICENSE = BSD-3-Clause
Expand Down

0 comments on commit c59845e

Please sign in to comment.