cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix update to imlib2-1.4.7

Browse Source 
No API/ABI changes
This commit is contained in:
dcoppa 2015-04-23 17:31:21 +00:00
parent b8d4cc0e49
commit f497de206c
10 changed files with 104 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/imlib2/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.35 2013/09/25 07:56:59 sthen Exp $
# $OpenBSD: Makefile,v 1.36 2015/04/23 17:31:21 dcoppa Exp $
COMMENT= image manipulation library
DISTNAME= imlib2-1.4.2
REVISION= 3
SHARED_LIBS= Imlib2 6.0 # .5.0
DISTNAME= imlib2-1.4.7
SHARED_LIBS= Imlib2 6.0 # .5.7
CATEGORIES= graphics
HOMEPAGE= http://www.enlightenment.org/p.php?p=about/libs/imlib2&l=en

4
graphics/imlib2/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (imlib2-1.4.2.tar.gz) = kJnHwz5BULprQ9EtH74rdHnP4wKFr0mlMTN8GMCIEQo=
SIZE (imlib2-1.4.2.tar.gz) = 932684
SHA256 (imlib2-1.4.7.tar.gz) = SOmDN6Vg2JBPaFRH9BxDkU/sH4zTdFqf2Gy6n9JKZWM=
SIZE (imlib2-1.4.7.tar.gz) = 1027716

6
graphics/imlib2/patches/patch-imlib2_pc_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-imlib2_pc_in,v 1.1 2010/05/11 09:56:26 dcoppa Exp $
$OpenBSD: patch-imlib2_pc_in,v 1.2 2015/04/23 17:31:21 dcoppa Exp $
--- imlib2.pc.in.orig Sun Aug 17 11:39:14 2008
+++ imlib2.pc.in Mon May 10 18:33:26 2010
@@ -6,6 +6,6 @@ includedir=@includedir@
@ -7,6 +7,6 @@ $OpenBSD: patch-imlib2_pc_in,v 1.1 2010/05/11 09:56:26 dcoppa Exp $
Version: @VERSION@
-Libs: -L${libdir} -lImlib2
-Cflags: -I${includedir}
+Libs: -L${libdir} -lImlib2 @my_libs@
+Cflags: -I${includedir} @my_includes@
+Libs: -L${libdir} -lImlib2 @FREETYPE_LIBS@ -lX11 -lXext -lm
+Cflags: -I${includedir} @FREETYPE_CFLAGS@ @X_CFLAGS@

16
graphics/imlib2/patches/patch-src_lib_font_load_c
View File

@ -1,17 +1,17 @@
$OpenBSD: patch-src_lib_font_load_c,v 1.1 2009/12/28 17:22:21 phessler Exp $
--- src/lib/font_load.c.orig Mon Dec 28 04:57:35 2009
+++ src/lib/font_load.c Mon Dec 28 04:58:08 2009
@@ -221,6 +221,8 @@ imlib_font_free(ImlibFont * fn)
int
imlib_font_insert_into_fallback_chain_imp(ImlibFont * fn, ImlibFont * fallback)
$OpenBSD: patch-src_lib_font_load_c,v 1.2 2015/04/23 17:31:21 dcoppa Exp $
--- src/lib/font_load.c.orig Sat Dec 20 17:19:19 2014
+++ src/lib/font_load.c Thu Apr 23 08:30:54 2015
@@ -228,6 +228,8 @@ int
__imlib_font_insert_into_fallback_chain_imp(ImlibFont * fn,
ImlibFont * fallback)
{
+ ImlibFont *tmp;
+
/* avoid infinite recursion */
if (fn == fallback)
return 1;
@@ -229,7 +231,7 @@ imlib_font_insert_into_fallback_chain_imp(ImlibFont *
imlib_font_remove_from_fallback_chain_imp(fallback);
@@ -236,7 +238,7 @@ __imlib_font_insert_into_fallback_chain_imp(ImlibFont
__imlib_font_remove_from_fallback_chain_imp(fallback);
/* insert fallback into fn's font chain */
- ImlibFont *tmp = fn->fallback_next;

23
graphics/imlib2/patches/patch-src_modules_filters_Makefile_in Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-src_modules_filters_Makefile_in,v 1.1 2015/04/23 17:31:21 dcoppa Exp $
Revert commit 5b60182d96fa136366e1f5ae6329edcbc886d47f (Don't build
static libs for modules)
--- src/modules/filters/Makefile.in.orig Sat Apr 4 20:19:48 2015
+++ src/modules/filters/Makefile.in Thu Apr 23 10:07:58 2015
@@ -369,15 +369,12 @@ EXTRA_DIST = filter_common.h
testfilter_la_SOURCES = filter_test.c
testfilter_la_LDFLAGS = -module -avoid-version
testfilter_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
-testfilter_la_LIBTOOLFLAGS = --tag=disable-static
bumpmap_la_SOURCES = filter_bumpmap.c
bumpmap_la_LDFLAGS = -module -avoid-version
bumpmap_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la -lm
-bumpmap_la_LIBTOOLFLAGS = --tag=disable-static
colormod_la_SOURCES = filter_colormod.c
colormod_la_LDFLAGS = -module -avoid-version
colormod_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
-colormod_la_LIBTOOLFLAGS = --tag=disable-static
all: all-am
.SUFFIXES:

64
graphics/imlib2/patches/patch-src_modules_loaders_Makefile_in Normal file
View File

@ -0,0 +1,64 @@
$OpenBSD: patch-src_modules_loaders_Makefile_in,v 1.1 2015/04/23 17:31:21 dcoppa Exp $
Revert commit 5b60182d96fa136366e1f5ae6329edcbc886d47f (Don't build
static libs for modules)
--- src/modules/loaders/Makefile.in.orig Sat Apr 4 20:19:49 2015
+++ src/modules/loaders/Makefile.in Thu Apr 23 10:08:13 2015
@@ -461,56 +461,43 @@ EXTRA_DIST = loader_common.h
jpeg_la_SOURCES = loader_jpeg.c
jpeg_la_LDFLAGS = -module -avoid-version
jpeg_la_LIBADD = @JPEGLIBS@ $(top_builddir)/src/lib/libImlib2.la
-jpeg_la_LIBTOOLFLAGS = --tag=disable-static
png_la_SOURCES = loader_png.c
png_la_CPPFLAGS = @PNG_CFLAGS@ $(AM_CPPFLAGS)
png_la_LDFLAGS = -module -avoid-version
png_la_LIBADD = @PNG_LIBS@ $(top_builddir)/src/lib/libImlib2.la
-png_la_LIBTOOLFLAGS = --tag=disable-static
tiff_la_SOURCES = loader_tiff.c
tiff_la_LDFLAGS = -module -avoid-version
tiff_la_LIBADD = @TIFFLIBS@ $(top_builddir)/src/lib/libImlib2.la
-tiff_la_LIBTOOLFLAGS = --tag=disable-static
gif_la_SOURCES = loader_gif.c
gif_la_LDFLAGS = -module -avoid-version
gif_la_LIBADD = @GIFLIBS@ $(top_builddir)/src/lib/libImlib2.la
-gif_la_LIBTOOLFLAGS = --tag=disable-static
zlib_la_SOURCES = loader_zlib.c
zlib_la_LDFLAGS = -module -avoid-version
zlib_la_LIBADD = @ZLIBLIBS@ $(top_builddir)/src/lib/libImlib2.la
-zlib_la_LIBTOOLFLAGS = --tag=disable-static
bz2_la_SOURCES = loader_bz2.c
bz2_la_LDFLAGS = -module -avoid-version
bz2_la_LIBADD = @BZ2LIBS@ $(top_builddir)/src/lib/libImlib2.la
-bz2_la_LIBTOOLFLAGS = --tag=disable-static
id3_la_SOURCES = loader_id3.c
id3_la_LDFLAGS = -module -avoid-version
id3_la_LIBADD = @ID3LIBS@ $(top_builddir)/src/lib/libImlib2.la
-id3_la_LIBTOOLFLAGS = --tag=disable-static
pnm_la_SOURCES = loader_pnm.c
pnm_la_LDFLAGS = -module -avoid-version
pnm_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
-pnm_la_LIBTOOLFLAGS = --tag=disable-static
argb_la_SOURCES = loader_argb.c
argb_la_LDFLAGS = -module -avoid-version
argb_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
-argb_la_LIBTOOLFLAGS = --tag=disable-static
bmp_la_SOURCES = loader_bmp.c
bmp_la_LDFLAGS = -module -avoid-version
bmp_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
-bmp_la_LIBTOOLFLAGS = --tag=disable-static
xpm_la_SOURCES = loader_xpm.c
xpm_la_LDFLAGS = -module -avoid-version
xpm_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
-xpm_la_LIBTOOLFLAGS = --tag=disable-static
tga_la_SOURCES = loader_tga.c
tga_la_LDFLAGS = -module -avoid-version
tga_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
-tga_la_LIBTOOLFLAGS = --tag=disable-static
lbm_la_SOURCES = loader_lbm.c
lbm_la_LDFLAGS = -module -avoid-version
lbm_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
-lbm_la_LIBTOOLFLAGS = --tag=disable-static
all: all-am
.SUFFIXES:

67
graphics/imlib2/patches/patch-src_modules_loaders_loader_gif_c
View File

@ -1,67 +0,0 @@
$OpenBSD: patch-src_modules_loaders_loader_gif_c,v 1.4 2015/03/28 16:01:55 sthen Exp $
handle giflib 5.1+
--- src/modules/loaders/loader_gif.c.orig Sun Aug 17 10:39:13 2008
+++ src/modules/loaders/loader_gif.c Sat Mar 28 16:00:23 2015
@@ -36,7 +36,7 @@ load(ImlibImage * im, ImlibProgressFunction progress,
#endif
if (fd < 0)
return 0;
- gif = DGifOpenFileHandle(fd);
+ gif = DGifOpenFileHandle(fd, NULL);
if (!gif)
{
close(fd);
@@ -60,13 +60,13 @@ load(ImlibImage * im, ImlibProgressFunction progress,
h = gif->Image.Height;
if ((w < 1) || (h < 1) || (w > 8192) || (h > 8192))
{
- DGifCloseFile(gif);
+ DGifCloseFile(gif, NULL);
return 0;
}
rows = malloc(h * sizeof(GifRowType *));
if (!rows)
{
- DGifCloseFile(gif);
+ DGifCloseFile(gif, NULL);
return 0;
}
for (i = 0; i < h; i++)
@@ -78,7 +78,7 @@ load(ImlibImage * im, ImlibProgressFunction progress,
rows[i] = malloc(w * sizeof(GifPixelType));
if (!rows[i])
{
- DGifCloseFile(gif);
+ DGifCloseFile(gif, NULL);
for (i = 0; i < h; i++)
{
if (rows[i])
@@ -149,7 +149,7 @@ load(ImlibImage * im, ImlibProgressFunction progress,
im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h);
if (!im->data)
{
- DGifCloseFile(gif);
+ DGifCloseFile(gif, NULL);
free(rows);
return 0;
}
@@ -180,7 +180,7 @@ load(ImlibImage * im, ImlibProgressFunction progress,
last_per = (int)per;
if (!(progress(im, (int)per, 0, last_y, w, i)))
{
- DGifCloseFile(gif);
+ DGifCloseFile(gif, NULL);
for (i = 0; i < h; i++)
{
free(rows[i]);
@@ -197,7 +197,7 @@ load(ImlibImage * im, ImlibProgressFunction progress,
{
progress(im, 100, 0, last_y, w, h);
}
- DGifCloseFile(gif);
+ DGifCloseFile(gif, NULL);
for (i = 0; i < h; i++)
{
free(rows[i]);

76
graphics/imlib2/patches/patch-src_modules_loaders_loader_png_c
View File

@ -1,76 +0,0 @@
$OpenBSD: patch-src_modules_loaders_loader_png_c,v 1.3 2011/07/08 20:36:09 naddy Exp $
Fix build with png-1.5.
--- src/modules/loaders/loader_png.c.orig Sun Aug 17 03:39:13 2008
+++ src/modules/loaders/loader_png.c Mon Jul 4 16:07:25 2011
@@ -58,7 +58,7 @@ load(ImlibImage * im, ImlibProgressFunction progress,
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, ImlibProgressFunction progress,
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, ImlibProgressFunction progress,
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, ImlibProgressFunction progress,
}
/* 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, ImlibProgressFunction progress,
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, ImlibProgressFunction progress,
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));
}
@@ -343,6 +343,10 @@ save(ImlibImage * im, ImlibProgressFunction progress,
png_write_info(png_ptr, info_ptr);
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++)
{

18
graphics/imlib2/patches/patch-src_modules_loaders_loader_xpm_c
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-src_modules_loaders_loader_xpm_c,v 1.5 2009/04/30 10:09:49 simon Exp $
Chunk at line 246:
CVE-2008-5187, Buffer overflow in the xpm loader.
Patch from Debian's original bug report, #505714
--- src/modules/loaders/loader_xpm.c.orig Tue Oct 21 04:32:51 2008
+++ src/modules/loaders/loader_xpm.c Wed Apr 29 10:39:45 2009
@@ -253,8 +253,8 @@ load(ImlibImage * im, ImlibProgressFunction progress,
return 0;
}
ptr = im->data;
- end = ptr + (sizeof(DATA32) * w * h);
pixels = w * h;
+ end = ptr + pixels;
}
else
{

3
graphics/imlib2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2009/04/30 10:09:49 simon Exp $
@comment $OpenBSD: PLIST,v 1.6 2015/04/23 17:31:21 dcoppa Exp $
bin/imlib2-config
@bin bin/imlib2_bumpmap
@bin bin/imlib2_colorspace
@ -46,7 +46,6 @@ lib/imlib2/loaders/zlib.a
lib/imlib2/loaders/zlib.la
lib/libImlib2.a
lib/libImlib2.la
lib/pkgconfig/
lib/pkgconfig/imlib2.pc
%%SHARED%%
share/imlib2/