head 1.10; access; symbols pkgsrc-2018Q3:1.9.0.38 pkgsrc-2018Q3-base:1.9 pkgsrc-2018Q2:1.9.0.36 pkgsrc-2018Q2-base:1.9 pkgsrc-2018Q1:1.9.0.34 pkgsrc-2018Q1-base:1.9 pkgsrc-2017Q4:1.9.0.32 pkgsrc-2017Q4-base:1.9 pkgsrc-2017Q3:1.9.0.30 pkgsrc-2017Q3-base:1.9 pkgsrc-2017Q2:1.9.0.26 pkgsrc-2017Q2-base:1.9 pkgsrc-2017Q1:1.9.0.24 pkgsrc-2017Q1-base:1.9 pkgsrc-2016Q4:1.9.0.22 pkgsrc-2016Q4-base:1.9 pkgsrc-2016Q3:1.9.0.20 pkgsrc-2016Q3-base:1.9 pkgsrc-2016Q2:1.9.0.18 pkgsrc-2016Q2-base:1.9 pkgsrc-2016Q1:1.9.0.16 pkgsrc-2016Q1-base:1.9 pkgsrc-2015Q4:1.9.0.14 pkgsrc-2015Q4-base:1.9 pkgsrc-2015Q3:1.9.0.12 pkgsrc-2015Q3-base:1.9 pkgsrc-2015Q2:1.9.0.10 pkgsrc-2015Q2-base:1.9 pkgsrc-2015Q1:1.9.0.8 pkgsrc-2015Q1-base:1.9 pkgsrc-2014Q4:1.9.0.6 pkgsrc-2014Q4-base:1.9 pkgsrc-2014Q3:1.9.0.4 pkgsrc-2014Q3-base:1.9 pkgsrc-2014Q2:1.9.0.2 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.8.0.20 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.18 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.16 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.14 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.12 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.10 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.8 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.6 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.4 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.2 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.7.0.4 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.2 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.6.0.2 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.5.0.32 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.30 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.28 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.26 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.24 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.22 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.20 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.18 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.16 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.14 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.12 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.10 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.8 pkgsrc-2008Q1:1.5.0.6 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.4 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.2 pkgsrc-2007Q3-base:1.5 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.10 date 2018.11.29.13.58.59; author leot; state dead; branches; next 1.9; commitid dEwceO78LL5mqQ1B; 1.9 date 2014.05.17.09.25.01; author adam; state Exp; branches; next 1.8; commitid hLDpVm3yD03SaSAx; 1.8 date 2011.11.07.12.14.15; author drochner; state Exp; branches; next 1.7; 1.7 date 2011.05.18.10.04.26; author drochner; state Exp; branches; next 1.6; 1.6 date 2011.01.31.10.22.26; author wiz; state Exp; branches; next 1.5; 1.5 date 2007.09.18.19.18.11; author drochner; 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.10 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-ac,v 1.9 2014/05/17 09:25:01 adam Exp $ Add minimalist #ifndef blocks to rip out XShm support on Interix. --- src/lib/grab.c.orig 2013-12-21 10:16:10.000000000 +0000 +++ src/lib/grab.c @@@@ -528,7 +528,9 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data int i; int src_x, src_y, src_w, src_h; int width, height, clipx, clipy; +#ifndef __INTERIX XShmSegmentInfo shminfo, mshminfo; +#endif XImage *xim, *mxim; XColor cols[256]; @@@@ -661,11 +663,13 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data __imlib_ShmCheck(d); xim = NULL; +#ifndef __INTERIX if (x_does_shm) { xim = __imlib_ShmGetXImage(d, v, p, xatt.depth, x, y, w, h, &shminfo); is_shm = ! !xim; } +#endif /* !__INTERIX */ if (!xim) xim = XGetImage(d, p, x, y, w, h, 0xffffffff, ZPixmap); if (!xim) @@@@ -736,8 +740,10 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data d, xim, mxim, v, xatt.depth, x, y, w, h, 0); /* destroy the Ximage */ +#ifndef __INTERIX if (is_shm) __imlib_ShmDetach(d, &shminfo); +#endif /* !__INTERIX */ XDestroyImage(xim); if (mxim) { @ 1.9 log @Version 1.4.6 - TGA loader: Fix for corrupt RLE format. - Fix drawing of closed polygons in certain situations (ticket 2309). - Set warning options when using gcc. - Silence compiler warnings. - Don't set -std=gnu99. - XPM loader: Simplify and fix certain case of cpp > 2. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.8 2011/11/07 12:14:15 drochner Exp $ @ 1.8 log @update to 1.4.5 changes: -bugfixes -cleanup, spelling fixes @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- src/lib/grab.c.orig 2011-04-15 22:05:28.000000000 +0000 d7 1 a7 1 @@@@ -530,7 +530,9 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data d9 1 a9 1 int src_x, src_y, src_w, src_h, origw, origh; d17 1 a17 1 @@@@ -665,11 +667,13 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data d31 1 a31 1 @@@@ -740,8 +744,10 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data @ 1.7 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 @d5 1 a5 1 --- src/lib/grab.c.orig 2010-05-05 18:25:50.000000000 +0000 d25 1 a25 1 is_shm = xim != NULL; @ 1.6 log @Add comments to patches. @ text @d1 1 a1 3 $NetBSD: patch-ac,v 1.5 2007/09/18 19:18:11 drochner Exp $ Use my_lround() on Interix too. d5 1 a5 1 --- src/lib/grab.c.orig 2007-02-16 12:58:53.000000000 +0100 d7 1 a7 1 @@@@ -539,7 +539,9 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data d13 2 a14 3 +#endif /* !__INTERIX */ XImage *xim = NULL, *mxim = NULL; static signed char x_does_shm = -1; a15 11 @@@@ -673,14 +675,17 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data /* Create an Ximage (shared or not) */ if (x_does_shm < 0) { +#ifndef __INTERIX if (XShmQueryExtension(d)) x_does_shm = 1; else +#endif /* !__INTERIX */ x_does_shm = 0; } d17 2 a18 1 prev_erh = XSetErrorHandler((XErrorHandler) Tmp_HandleXError); d20 1 d24 2 a25 4 _x_err = 0; @@@@ -727,6 +732,7 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data } } d28 1 a28 1 if (!is_shm) d31 1 a31 17 @@@@ -739,6 +745,7 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data if ((m) && (domask)) { _x_err = 0; +#ifndef __INTERIX if (x_does_shm) { mxim = XShmCreateImage(d, v, 1, ZPixmap, NULL, &mshminfo, w, h); @@@@ -786,6 +793,7 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data } } } +#endif /* !__INTERIX */ if (!is_mshm) mxim = XGetImage(d, m, 0, 0, w, h, 0xffffffff, ZPixmap); } @@@@ -844,6 +852,7 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data d37 1 a37 6 { XSync(d, False); @@@@ -857,6 +866,7 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data shmdt(mshminfo.shmaddr); shmctl(mshminfo.shmid, IPC_RMID, 0); } d40 2 a41 2 if (created_mask) XFreePixmap(d, m); @ 1.5 log @update to 1.4.0 changes: security fixes, and a few crashes fixed @ text @d1 5 a5 1 $NetBSD$ @ 1.4 log @Use my_lround() on Interix too. Add minimalist #ifndef blocks to rip out XShm support on Interix. @ text @d3 1 a3 1 --- src/lib/grab.c.orig 2004-11-01 04:39:42.000000000 -0500 d5 1 a5 1 @@@@ -412,7 +412,9 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data d15 1 a15 1 @@@@ -545,14 +547,17 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data d33 1 a33 1 @@@@ -599,12 +604,14 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data d40 2 a41 1 d49 1 a49 1 @@@@ -652,6 +659,7 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data d57 1 a57 1 @@@@ -705,6 +713,7 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data d65 1 a65 1 @@@@ -718,6 +727,7 @@@@ __imlib_GrabDrawableToRGBA(DATA32 * data @ 1.3 log @Changes 1.2.0: * Source tree clean up * Bug fixes @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2004/09/06 02:56:07 rh Exp $ d3 23 a25 5 --- loaders/Makefile.in.orig 2004-08-31 05:23:11.000000000 +0200 +++ loaders/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 d27 1 a27 3 -LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib +LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs @@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) d29 11 d41 31 @ 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 --- filters/Makefile.in.orig 2004-08-26 20:30:16.000000000 +0200 +++ filters/Makefile.in 2004-08-26 20:30:32.000000000 +0200 @@@@ -113,7 +113,7 @@@@ d9 1 a9 1 -LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/.libs -L/usr/X11R6/lib d11 1 a11 1 INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/loaders -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) @