head 1.7; access; symbols pkgsrc-2018Q3:1.6.0.62 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.60 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.58 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.56 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.54 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.50 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.48 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.46 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.44 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.42 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.40 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.38 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.36 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.34 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.32 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.30 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.28 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.26 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.24 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.22 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.20 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.18 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.16 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.14 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.12 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.10 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.8 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.6 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.4 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.2 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.5.0.2 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.4.0.46 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.44 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.42 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.40 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.38 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.36 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.34 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.32 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.30 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.28 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.26 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.24 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.22 pkgsrc-2008Q1:1.4.0.20 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.18 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.16 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.14 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.12 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.10 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.8 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.6 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.4 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.2 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.3.0.6 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.4 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.2 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.2.0.4 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.2 pkgsrc-2004Q3-base:1.2; locks; strict; comment @# @; 1.7 date 2018.11.29.13.58.59; author leot; state dead; branches; next 1.6; commitid dEwceO78LL5mqQ1B; 1.6 date 2011.05.18.10.04.26; author drochner; state Exp; branches; next 1.5; 1.5 date 2011.01.31.10.22.26; author wiz; state Exp; branches; next 1.4; 1.4 date 2005.11.04.20.11.47; author tv; state Exp; branches; next 1.3; 1.3 date 2005.01.11.13.37.54; author adam; state dead; branches; next 1.2; 1.2 date 2004.09.06.02.56.07; author rh; state Exp; branches; next 1.1; 1.1 date 2004.08.26.20.21.58; author recht; state Exp; branches; next ; desc @@ 1.7 log @imlib2: Update graphics/imlib to 1.5.1 pkgsrc changes: - Remove lround patches: lround is no longer used - Remove #ifndef blocks to rip out XShm support. Unfortunately the logic is much more convoluted now and #ifndef parts of the code no longer scale. Please note that this can break support on Interix! Changes: 1.5.1 ***** Kim Woelders (13): - Fix build without HAVE_X11_SHM_FD (T6752) - XPM loader: Fix potential use of uninitialized value (T6746) - BMP loader: Fix infinite loop with invalid bmp images (T6749) - PNM loader: Simplify (fixing ASCII format parsing issues T6751) - BMP loader: Fix warnings found with -O3 - Maximum image dimension should be 32767, not 32766 - PNG loader: Correct various error handling cases - Add missing const to imlib_apply_filter() script argument - Warning fixes in imlib2_... programs - imlib2_view: Limit window dimensions to 32767 - grab.c: Fix gcc8 warning - imlib2_conv.c: Fix gcc8 warning - 1.5.1. 1.5.0 ***** Alexander Volkov (3): - put a check for shared memory inside __imlib_ShmGetXImage() - introduce __imlib_ShmDestroyXImage() instead of __imlib_ShmDetach() - Add support for MIT-SHM FD-passing Kim Woelders (19): - XPM loader: Fix incorrect image invalidation. - Make some more functions static. - Introduce __imlib_LoadImageData() - Remove redundant CAST_IMAGE() - imlib2_grab: Always use imlib_create_scaled_image_from_drawable() to grab image - imlib_create_scaled_image_from_drawable(): speed up 1:1 case - imlib_create_scaled_image_from_drawable(): Drop shape handling if unshaped - Indent - Autofoo cosmetics - Strip trailing whitespace, cosmetics - Fix potential OOB memory access if border elements are negative - Fix potential OOB memory access if border sizes exceed image dimensions - Introduce IMLIB2_SHM_OPT to enable overriding/testing SHM modes - Add IMLIB2_XIMAGE_CACHE_COUNT to enable testing the ximage cache - Refactor the XImage cache - Add imlib_get_cache_used() - Expose XImage cache control functions - Drop -Waggregate-return - 1.5.0. @ text @$NetBSD: patch-ae,v 1.6 2011/05/18 10:04:26 drochner Exp $ Add minimalist #ifndef blocks to rip out XShm support on Interix. --- src/lib/ximage.c.orig 2010-05-05 18:25:50.000000000 +0000 +++ src/lib/ximage.c @@@@ -36,11 +36,13 @@@@ TmpXError(Display * d, XErrorEvent * ev) void __imlib_ShmCheck(Display * d) { +#ifndef __INTERIX /* if its there set x_does_shm flag */ if (XShmQueryExtension(d)) x_does_shm = 2; /* 2: __imlib_ShmGetXImage tests first XShmAttach */ /* clear the flag - no shm at all */ else +#endif /* !__INTERIX */ x_does_shm = 0; } @@@@ -185,11 +187,13 @@@@ __imlib_FlushXImage(Display * d) xim = list_xim[i]; list_mem_use -= xim->bytes_per_line * xim->height; +#ifndef __INTERIX if (list_si[i]) { __imlib_ShmDetach(d, list_si[i]); free(list_si[i]); } +#endif /* !__INTERIX */ XDestroyImage(xim); list_num--; for (j = i; j < list_num; j++) @@@@ -316,12 +320,14 @@@@ __imlib_ProduceXImage(Display * d, Visua /* work on making a shared image */ xim = NULL; +#ifndef __INTERIX /* if the server does shm */ if (x_does_shm) { xim = __imlib_ShmGetXImage(d, v, None, depth, 0, 0, w, h, list_si[list_num - 1]); } +#endif /* !__INTERIX */ /* ok if xim == NULL it all failed - fall back to XImages */ if (xim) { @ 1.6 log @update to 1.4.4 changes: misc bugfixes and cleanup The code structure around Xshm has changed -- someone please check the Interix specific patches. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Add comments to patches. @ text @d1 1 a1 3 $NetBSD: patch-ae,v 1.4 2005/11/04 20:11:47 tv Exp $ Use my_lround() on Interix too. d5 1 a5 1 --- src/lib/ximage.c.orig 2004-11-01 04:39:42.000000000 -0500 d7 15 a21 1 @@@@ -81,8 +81,10 @@@@ __imlib_FlushXImage(Display * d) d27 4 a30 1 XShmDetach(d, list_si[i]); d33 3 a35 17 if (list_si[i]) { @@@@ -163,11 +165,13 @@@@ __imlib_ProduceXImage(Display * d, Visua /* if we havent check the shm extension before - see if its there */ if (x_does_shm < 0) { +#ifndef __INTERIX /* if its there set dose_xhm flag */ if (XShmQueryExtension(d)) x_does_shm = 1; /* clear the flag - no shm at all */ else +#endif x_does_shm = 0; } /* find a cached XImage (to avoid server to & fro) that is big enough */ @@@@ -219,6 +223,7 @@@@ __imlib_ProduceXImage(Display * d, Visua d43 2 a44 3 @@@@ -301,6 +306,7 @@@@ __imlib_ProduceXImage(Display * d, Visua } } d48 1 a48 1 if (!xim) @ 1.4 log @Use my_lround() on Interix too. Add minimalist #ifndef blocks to rip out XShm support on Interix. @ text @d1 5 a5 1 $NetBSD$ @ 1.3 log @Changes 1.2.0: * Source tree clean up * Bug fixes @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.2 2004/09/06 02:56:07 rh Exp $ d3 3 a5 9 --- test/Makefile.in.orig 2004-08-31 05:23:11.000000000 +0200 +++ test/Makefile.in @@@@ -114,7 +114,7 @@@@ AUTOMAKE_OPTIONS = 1.4 foreign # A list of all the files in the current directory which can be regenerated MAINTAINERCLEANFILES = Makefile.in -LDFLAGS = -L/usr/X11R6/lib +LDFLAGS = @@LDFLAGS@@ INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) d7 24 d32 14 @ 1.2 log @Update imlib2 to 1.1.2. This version now includes an IFF ILBM loader. More importantly, this version fixes a buffer overflow vulnerability. Closes PR 26833 by Peter Bex. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Update to imlib2-1.1.1. No real changelog available, so I'm guessing it are only bug-fixes.. @ text @d3 3 a5 3 --- demo/Makefile.in.orig 2004-08-26 20:43:34.000000000 +0200 +++ demo/Makefile.in 2004-08-26 20:43:49.000000000 +0200 @@@@ -113,7 +113,7 @@@@ d11 1 a11 1 INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) @