summaryrefslogtreecommitdiff
path: root/graphics/imlib
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2014-05-22 11:50:41 +0000
committerobache <obache@pkgsrc.org>2014-05-22 11:50:41 +0000
commit7376004c7f346313ffb114e9517f4ce1580234ed (patch)
tree02c78492aba1d5bc4773e4ffbf1c9976f5851ee4 /graphics/imlib
parent18471a94e5f990b96efb4d23d30ce296e11b5a22 (diff)
downloadpkgsrc-7376004c7f346313ffb114e9517f4ce1580234ed.tar.gz
Fixes build with giflib>=5.1, and fixes buges introduced as giflib-5.0 support.
Diffstat (limited to 'graphics/imlib')
-rw-r--r--graphics/imlib/distinfo6
-rw-r--r--graphics/imlib/patches/patch-ab54
-rw-r--r--graphics/imlib/patches/patch-ak19
3 files changed, 48 insertions, 31 deletions
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index a2821c486b0..0dc0a35850d 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.23 2013/08/17 15:42:28 joerg Exp $
+$NetBSD: distinfo,v 1.24 2014/05/22 11:50:41 obache Exp $
SHA1 (imlib-1.9.15.tar.bz2) = c9a732a354fbb3c7e1a426e5d19fc92d73f8f720
RMD160 (imlib-1.9.15.tar.bz2) = 195b80833167134ba2d9a9574d420279f9cf55f4
Size (imlib-1.9.15.tar.bz2) = 683242 bytes
SHA1 (patch-aa) = fc990bb2278e6a848034f9c7be0170e1843b67b2
-SHA1 (patch-ab) = 60d87a85d3244fa74883b0cc16fcadad645ca089
+SHA1 (patch-ab) = e46a4c5d971819cadac3b484f81b2418eb6c3ac3
SHA1 (patch-ac) = 7dd08bde4e97614777bf4327db2e6045db04692d
SHA1 (patch-ad) = 1fc310d57c12337cc8ccddb7dd907330127b7112
SHA1 (patch-ae) = 3ed6fff2e73f04ec83c27dc6e3f2db2fa446abbb
@@ -12,7 +12,7 @@ SHA1 (patch-ag) = 7ef3980a6a3eccba41895ef86eae727cd7dfb1e2
SHA1 (patch-ah) = edee5311a47d552f9d1b9dcb96f256518040c538
SHA1 (patch-ai) = df13b72272f754375348437b99d962cb17732619
SHA1 (patch-aj) = 60171b7341c65fb6eb0a93738fef4b2c31692bdf
-SHA1 (patch-ak) = f9f9644a3a93d4e4992e2205c30de5769730bb38
+SHA1 (patch-ak) = a7c4f8f1d5df3d014ec049ce93be44d36f943cb2
SHA1 (patch-al) = 4ad51c7128f7d6a5ecc67f51c745caf53a4def06
SHA1 (patch-am) = 73c62e11f5b6ac6774e51f8183987b2b4db01465
SHA1 (patch-an) = 260aeece3eb74d3ec11deed4e38fd46d3f1cde79
diff --git a/graphics/imlib/patches/patch-ab b/graphics/imlib/patches/patch-ab
index 530d146e764..6b20eb6658f 100644
--- a/graphics/imlib/patches/patch-ab
+++ b/graphics/imlib/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.9 2013/08/17 15:42:28 joerg Exp $
+$NetBSD: patch-ab,v 1.10 2014/05/22 11:50:41 obache Exp $
-Middle chunks: Fix build with png-1.5.
+Middle chunks: Fix build with png-1.5 and giflib>=5
Others: ???
--- Imlib/load.c.orig 2004-09-21 00:23:20.000000000 +0000
@@ -98,30 +98,21 @@ Others: ???
{
TIFFClose(tif);
return NULL;
-@@ -432,7 +453,7 @@ _LoadGIF(ImlibData * id, FILE *f, int *w
- int intoffset[] = {0, 4, 2, 1};
- int intjump[] = {8, 8, 4, 2};
- int istransp, transp;
-- int fd;
-+ int fd, giferror;
-
- done = 0;
- istransp = 0;
@@ -443,7 +464,7 @@ _LoadGIF(ImlibData * id, FILE *f, int *w
fd = fileno(f);
/* Apparently rewind(f) isn't sufficient */
lseek(fd, (long) 0, 0);
- gif = DGifOpenFileHandle(fd);
-+ gif = DGifOpenFileHandle(fd, &giferror);
++ gif = DGifOpenFileHandle(fd, NULL);
if (!gif)
return NULL;
-@@ -451,19 +472,19 @@ _LoadGIF(ImlibData * id, FILE *f, int *w
+@@ -451,32 +472,32 @@ _LoadGIF(ImlibData * id, FILE *f, int *w
{
if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
{
- PrintGifError();
-+ PrintGifError(giferror);
++ PrintGifError(gif->Error);
rec = TERMINATE_RECORD_TYPE;
}
if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
@@ -129,7 +120,7 @@ Others: ???
if (DGifGetImageDesc(gif) == GIF_ERROR)
{
- PrintGifError();
-+ PrintGifError(giferror);
++ PrintGifError(gif->Error);
rec = TERMINATE_RECORD_TYPE;
}
*w = gif->Image.Width;
@@ -139,6 +130,39 @@ Others: ???
{
return NULL;
}
+ rows = malloc(*h * sizeof(GifRowType *));
+ if (!rows)
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ return NULL;
+ }
+ data = _imlib_malloc_image(*w, *h);
+ if (!data)
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ free(rows);
+ return NULL;
+ }
+@@ -487,7 +508,7 @@ _LoadGIF(ImlibData * id, FILE *f, int *w
+ rows[i] = malloc(*w * sizeof(GifPixelType));
+ if (!rows[i])
+ {
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ for (i = 0; i < *h; i++)
+ if (rows[i])
+ free(rows[i]);
+@@ -576,7 +597,7 @@ _LoadGIF(ImlibData * id, FILE *f, int *w
+ }
+ }
+ }
+- DGifCloseFile(gif);
++ DGifCloseFile(gif, NULL);
+ for (i = 0; i < *h; i++)
+ free(rows[i]);
+ free(rows);
@@ -1000,7 +1021,12 @@ _LoadXPM(ImlibData * id, FILE *file, int
comment = 0;
quote = 0;
diff --git a/graphics/imlib/patches/patch-ak b/graphics/imlib/patches/patch-ak
index dc731106f54..2753c4b7d5e 100644
--- a/graphics/imlib/patches/patch-ak
+++ b/graphics/imlib/patches/patch-ak
@@ -1,4 +1,6 @@
-$NetBSD: patch-ak,v 1.2 2013/08/17 11:15:58 joerg Exp $
+$NetBSD: patch-ak,v 1.3 2014/05/22 11:50:41 obache Exp $
+
+* Fixes build with giflib>=5
--- gdk_imlib/io-gif.c.orig 2002-03-04 17:06:29.000000000 +0000
+++ gdk_imlib/io-gif.c
@@ -19,21 +21,12 @@ $NetBSD: patch-ak,v 1.2 2013/08/17 11:15:58 joerg Exp $
unsigned char *
loader_gif(FILE *f, int *w, int *h, int *t)
{
-@@ -22,7 +32,7 @@ loader_gif(FILE *f, int *w, int *h, int
- int intoffset[] = {0, 4, 2, 1};
- int intjump[] = {8, 8, 4, 2};
- int istransp, transp;
-- int fd;
-+ int fd, giferror = 0;
-
- done = 0;
- istransp = 0;
@@ -30,7 +40,7 @@ loader_gif(FILE *f, int *w, int *h, int
fd = fileno(f);
/* Apparently rewind(f) isn't sufficient */
lseek(fd, (long) 0, 0);
- gif = DGifOpenFileHandle(fd);
-+ gif = DGifOpenFileHandle(fd, &giferror);
++ gif = DGifOpenFileHandle(fd, NULL);
transp = -1;
data = NULL;
@@ -42,7 +35,7 @@ $NetBSD: patch-ak,v 1.2 2013/08/17 11:15:58 joerg Exp $
if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
{
- PrintGifError();
-+ PrintGifError(giferror);
++ PrintGifError(gif->Error);
rec = TERMINATE_RECORD_TYPE;
}
if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
@@ -50,7 +43,7 @@ $NetBSD: patch-ak,v 1.2 2013/08/17 11:15:58 joerg Exp $
if (DGifGetImageDesc(gif) == GIF_ERROR)
{
- PrintGifError();
-+ PrintGifError(giferror);
++ PrintGifError(gif->Error);
rec = TERMINATE_RECORD_TYPE;
}
*w = gif->Image.Width;
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-01 01:26:24 +0000