summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2015-10-24 15:47:02 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2015-10-24 19:58:04 +0200
commit1560c9a33aff6675b3d0b82f9041eb3b43476a4c (patch)
treec6593650237974777a47af8149a5a343fb726709
parentdf4148e45a128bbc99879c002ee86dc9c6ac41c1 (diff)
imlib2: update to latest stable version
-rw-r--r--package/imlib2/Makefile6
-rw-r--r--package/imlib2/patches/patch-ltmain_sh11
-rw-r--r--package/imlib2/patches/patch-src_modules_loaders_loader_png_c72
3 files changed, 3 insertions, 86 deletions
diff --git a/package/imlib2/Makefile b/package/imlib2/Makefile
index b8aab86be..fd6bc1055 100644
--- a/package/imlib2/Makefile
+++ b/package/imlib2/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= imlib2
-PKG_VERSION:= 1.4.4
-PKG_RELEASE:= 4
-PKG_HASH:= a4de52c90b8cd155b41ca70c2d34209f7b94a9e4f8e77582f2682a1795306198
+PKG_VERSION:= 1.4.7
+PKG_RELEASE:= 1
+PKG_HASH:= 48e98337a560d8904f685447f41c43914fec1f8cd3745a9fd86cba9fd24a6563
PKG_DESCR:= advanced replacement library for libraries like libxpm
PKG_SECTION:= libs/image
PKG_DEPENDS:= libfreetype zlib libpng libtiff libx11 libxext
diff --git a/package/imlib2/patches/patch-ltmain_sh b/package/imlib2/patches/patch-ltmain_sh
deleted file mode 100644
index 0abed66c0..000000000
--- a/package/imlib2/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- imlib2-1.4.4.orig/ltmain.sh 2010-05-05 20:26:26.000000000 +0200
-+++ imlib2-1.4.4/ltmain.sh 2011-01-15 11:42:11.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
diff --git a/package/imlib2/patches/patch-src_modules_loaders_loader_png_c b/package/imlib2/patches/patch-src_modules_loaders_loader_png_c
deleted file mode 100644
index b5bfacbf6..000000000
--- a/package/imlib2/patches/patch-src_modules_loaders_loader_png_c
+++ /dev/null
@@ -1,72 +0,0 @@
---- imlib2-1.4.4.orig/src/modules/loaders/loader_png.c 2010-02-11 21:02:11.000000000 +0100
-+++ imlib2-1.4.4/src/modules/loaders/loader_png.c 2011-03-29 21:33:23.221818699 +0200
-@@ -58,7 +58,7 @@ load(ImlibImage * im, ImlibProgressFunct
- fclose(f);
- return 0;
- }
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- {
- png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- fclose(f);
-@@ -238,7 +238,7 @@ save(ImlibImage * im, ImlibProgressFunct
- png_structp png_ptr;
- png_infop info_ptr;
- DATA32 *ptr;
-- int x, y, j;
-+ int x, y, j, interlace;
- png_bytep row_ptr, data = NULL;
- png_color_8 sig_bit;
- int pl = 0;
-@@ -265,7 +265,7 @@ save(ImlibImage * im, ImlibProgressFunct
- png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
- return 0;
- }
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- {
- fclose(f);
- png_destroy_write_struct(&png_ptr, (png_infopp) & info_ptr);
-@@ -274,11 +274,11 @@ save(ImlibImage * im, ImlibProgressFunct
- }
-
- /* check whether we should use interlacing */
-+ interlace = PNG_INTERLACE_NONE;
- if ((tag = __imlib_GetTag(im, "interlacing")) && tag->val)
- {
- #ifdef PNG_WRITE_INTERLACING_SUPPORTED
-- png_ptr->interlaced = PNG_INTERLACE_ADAM7;
-- num_passes = png_set_interlace_handling(png_ptr);
-+ interlace = PNG_INTERLACE_ADAM7;
- #endif
- }
-
-@@ -286,7 +286,7 @@ save(ImlibImage * im, ImlibProgressFunct
- if (im->flags & F_HAS_ALPHA)
- {
- png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8,
-- PNG_COLOR_TYPE_RGB_ALPHA, png_ptr->interlaced,
-+ PNG_COLOR_TYPE_RGB_ALPHA, interlace,
- PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
- #ifdef WORDS_BIGENDIAN
- png_set_swap_alpha(png_ptr);
-@@ -297,7 +297,7 @@ save(ImlibImage * im, ImlibProgressFunct
- else
- {
- png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8, PNG_COLOR_TYPE_RGB,
-- png_ptr->interlaced, PNG_COMPRESSION_TYPE_BASE,
-+ interlace, PNG_COMPRESSION_TYPE_BASE,
- PNG_FILTER_TYPE_BASE);
- data = malloc(im->w * 3 * sizeof(char));
- }
-@@ -344,6 +344,10 @@ save(ImlibImage * im, ImlibProgressFunct
- png_set_shift(png_ptr, &sig_bit);
- png_set_packing(png_ptr);
-
-+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-+ num_passes = png_set_interlace_handling(png_ptr);
-+#endif
-+
- for (pass = 0; pass < num_passes; pass++)
- {
- ptr = im->data;