[packages/imlib2] - updated to 1.4.8 - removed obsolete libpng-1.5,giflib5 patches
qboosh
qboosh at pld-linux.org
Sat Mar 19 07:15:47 CET 2016
commit 228baabe41b9cf9a1372dd3539e51c954e02b1b7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Mar 19 07:19:54 2016 +0100
- updated to 1.4.8
- removed obsolete libpng-1.5,giflib5 patches
giflib5.patch | 84 -------------------------------------------
imlib2-1.4.4-libpng-1.5.patch | 82 ------------------------------------------
imlib2.spec | 10 ++----
3 files changed, 3 insertions(+), 173 deletions(-)
---
diff --git a/imlib2.spec b/imlib2.spec
index e0852a8..5592122 100644
--- a/imlib2.spec
+++ b/imlib2.spec
@@ -1,14 +1,12 @@
Summary: Powerful image loading and rendering library
Summary(pl.UTF-8): Potężna biblioteka wczytująca i renderująca obrazki
Name: imlib2
-Version: 1.4.4
-Release: 6
+Version: 1.4.8
+Release: 1
License: BSD-like
Group: X11/Libraries
Source0: http://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.bz2
-# Source0-md5: b6de51879502e857d5b1f7622267a030
-Patch0: %{name}-1.4.4-libpng-1.5.patch
-Patch1: giflib5.patch
+# Source0-md5: 97cf1007b0339102974ce20c8f17c249
URL: http://enlightenment.org/p.php?p=about/libs/imlib2
BuildRequires: autoconf >= 2.52
BuildRequires: automake >= 1.6
@@ -76,8 +74,6 @@ Biblioteka statyczna imlib2.
%prep
%setup -q
-%patch0 -p0
-%patch1 -p1
%build
%{__libtoolize}
diff --git a/giflib5.patch b/giflib5.patch
deleted file mode 100644
index 9b58029..0000000
--- a/giflib5.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- imlib2-1.4.4/src/modules/loaders/loader_gif.c~ 2015-01-01 11:50:17.000000000 +0000
-+++ imlib2-1.4.4/src/modules/loaders/loader_gif.c 2015-01-01 11:53:22.771650740 +0000
-@@ -36,7 +37,11 @@
- #endif
- if (fd < 0)
- return 0;
-+#if GIFLIB_MAJOR >= 5
-+ gif = DGifOpenFileHandle(fd, NULL);
-+#else
- gif = DGifOpenFileHandle(fd);
-+#endif
- if (!gif)
- {
- close(fd);
-@@ -65,13 +65,21 @@
- h = gif->Image.Height;
- if (!IMAGE_DIMENSIONS_OK(w, h))
- {
-+#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
-+ DGifCloseFile(gif, NULL);
-+#else
- DGifCloseFile(gif);
-+#endif
- return 0;
- }
- rows = malloc(h * sizeof(GifRowType *));
- if (!rows)
- {
-+#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
-+ DGifCloseFile(gif, NULL);
-+#else
- DGifCloseFile(gif);
-+#endif
- return 0;
- }
- for (i = 0; i < h; i++)
-@@ -83,7 +91,11 @@
- rows[i] = malloc(w * sizeof(GifPixelType));
- if (!rows[i])
- {
-+#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
-+ DGifCloseFile(gif, NULL);
-+#else
- DGifCloseFile(gif);
-+#endif
- for (i = 0; i < h; i++)
- {
- if (rows[i])
-@@ -154,7 +166,11 @@
- im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h);
- if (!im->data)
- {
-+#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
-+ DGifCloseFile(gif, NULL);
-+#else
- DGifCloseFile(gif);
-+#endif
- free(rows);
- return 0;
- }
-@@ -185,7 +201,11 @@
- last_per = (int)per;
- if (!(progress(im, (int)per, 0, last_y, w, i)))
- {
-+#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
-+ DGifCloseFile(gif, NULL);
-+#else
- DGifCloseFile(gif);
-+#endif
- for (i = 0; i < h; i++)
- {
- free(rows[i]);
-@@ -202,7 +222,11 @@
- {
- progress(im, 100, 0, last_y, w, h);
- }
-+#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
-+ DGifCloseFile(gif, NULL);
-+#else
- DGifCloseFile(gif);
-+#endif
- for (i = 0; i < h; i++)
- {
- free(rows[i]);
diff --git a/imlib2-1.4.4-libpng-1.5.patch b/imlib2-1.4.4-libpng-1.5.patch
deleted file mode 100644
index 069538e..0000000
--- a/imlib2-1.4.4-libpng-1.5.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-http://bugs.gentoo.org/354989
-
-# http://sourceforge.net/mailarchive/message.php?msg_id=26972342
-
-$NetBSD: patch-af,v 1.4 2011/01/14 10:02:54 wiz Exp $
-
-Fix build with png-1.5.
-
-has also been committed upstream.
-
---- src/modules/loaders/loader_png.c
-+++ src/modules/loaders/loader_png.c
-@@ -58,7 +58,7 @@
- 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 @@
- 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 @@
- 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 @@
- }
-
- /* 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 @@
- 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 @@
- 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 @@
- 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;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/imlib2.git/commitdiff/228baabe41b9cf9a1372dd3539e51c954e02b1b7
More information about the pld-cvs-commit
mailing list