summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-multimedia/libpng/libpng/transform.patch46
-rw-r--r--meta/recipes-multimedia/libpng/libpng_1.6.2.bb (renamed from meta/recipes-multimedia/libpng/libpng_1.6.1.bb)9
2 files changed, 4 insertions, 51 deletions
diff --git a/meta/recipes-multimedia/libpng/libpng/transform.patch b/meta/recipes-multimedia/libpng/libpng/transform.patch
deleted file mode 100644
index 369a2c0b7f..0000000000
--- a/meta/recipes-multimedia/libpng/libpng/transform.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1Corrected the test on user transform changes on read. It was in the png_set of
2the transform function, but that doesn't matter unless the transform function
3changes the rowbuf size, and that is only valid if transform_info is called.
4
5Upstream-Status: Backport (will be in 1.6.2)
6 - b44cd59ad9747069b90c6ff0f76558157a61e26a
7 - a8715cabd11354da9650dff7c0770686a217b550
8Signed-off-by: Ross Burton <ross.burton@intel.com>
9
10
11diff --git a/pngrtran.c b/pngrtran.c
12index 626f3b0..4485e40 100644
13--- a/pngrtran.c
14+++ b/pngrtran.c
15@@ -1056,9 +1056,6 @@ png_set_read_user_transform_fn(png_structrp png_ptr, png_user_transform_ptr
16 {
17 png_debug(1, "in png_set_read_user_transform_fn");
18
19- if (!png_rtran_ok(png_ptr, 0))
20- return;
21-
22 #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
23 png_ptr->transformations |= PNG_USER_TRANSFORM;
24 png_ptr->read_user_transform_fn = read_user_transform_fn;
25diff --git a/pngtrans.c b/pngtrans.c
26index b532172..f822324 100644
27--- a/pngtrans.c
28+++ b/pngtrans.c
29@@ -782,6 +782,17 @@ png_set_user_transform_info(png_structrp png_ptr, png_voidp
30
31 if (png_ptr == NULL)
32 return;
33+
34+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
35+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
36+ (png_ptr->flags & PNG_FLAG_ROW_INIT) != 0)
37+ {
38+ png_app_error(png_ptr,
39+ "info change after png_start_read_image or png_read_update_info");
40+ return;
41+ }
42+#endif
43+
44 png_ptr->user_transform_ptr = user_transform_ptr;
45 png_ptr->user_transform_depth = (png_byte)user_transform_depth;
46 png_ptr->user_transform_channels = (png_byte)user_transform_channels;
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.1.bb b/meta/recipes-multimedia/libpng/libpng_1.6.2.bb
index 6f9fb09c84..7a19313c0e 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.1.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.2.bb
@@ -3,17 +3,16 @@ DESCRIPTION = "PNG Library"
3HOMEPAGE = "http://www.libpng.org/" 3HOMEPAGE = "http://www.libpng.org/"
4SECTION = "libs" 4SECTION = "libs"
5LICENSE = "Libpng" 5LICENSE = "Libpng"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=8273188b2e21c831f5a09fd9285db62f \ 6LIC_FILES_CHKSUM = "file://LICENSE;md5=b7c6b3f443bd29d45da5575f36293606 \
7 file://png.h;beginline=207;endline=321;md5=de107fb61766e9d826943f3b6a354fc9" 7 file://png.h;beginline=207;endline=321;md5=f8e34d28a077eca674b739ded0de063c"
8DEPENDS = "zlib" 8DEPENDS = "zlib"
9LIBV = "16" 9LIBV = "16"
10 10
11SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \ 11SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \
12 file://0001-configure-lower-automake-requirement.patch \ 12 file://0001-configure-lower-automake-requirement.patch \
13 file://transform.patch \
14 " 13 "
15SRC_URI[md5sum] = "93fc0b0841ce2db0e6756673e22dafc3" 14SRC_URI[md5sum] = "9d838f6fca9948a9f360a0cc1b516d5f"
16SRC_URI[sha256sum] = "5ef57f8b9ef591c8504e2a8f78d31779f0c8f2b34b34d01d533360d2483c8946" 15SRC_URI[sha256sum] = "1c97a90bc22107e50f04f77a0115f4ec890d5c6a373ac4c560e8fb87259e92de"
17 16
18inherit autotools binconfig pkgconfig 17inherit autotools binconfig pkgconfig
19 18