head 1.13; access; symbols pkgsrc-2018Q3:1.12.0.58 pkgsrc-2018Q3-base:1.12 pkgsrc-2018Q2:1.12.0.56 pkgsrc-2018Q2-base:1.12 pkgsrc-2018Q1:1.12.0.54 pkgsrc-2018Q1-base:1.12 pkgsrc-2017Q4:1.12.0.52 pkgsrc-2017Q4-base:1.12 pkgsrc-2017Q3:1.12.0.50 pkgsrc-2017Q3-base:1.12 pkgsrc-2017Q2:1.12.0.46 pkgsrc-2017Q2-base:1.12 pkgsrc-2017Q1:1.12.0.44 pkgsrc-2017Q1-base:1.12 pkgsrc-2016Q4:1.12.0.42 pkgsrc-2016Q4-base:1.12 pkgsrc-2016Q3:1.12.0.40 pkgsrc-2016Q3-base:1.12 pkgsrc-2016Q2:1.12.0.38 pkgsrc-2016Q2-base:1.12 pkgsrc-2016Q1:1.12.0.36 pkgsrc-2016Q1-base:1.12 pkgsrc-2015Q4:1.12.0.34 pkgsrc-2015Q4-base:1.12 pkgsrc-2015Q3:1.12.0.32 pkgsrc-2015Q3-base:1.12 pkgsrc-2015Q2:1.12.0.30 pkgsrc-2015Q2-base:1.12 pkgsrc-2015Q1:1.12.0.28 pkgsrc-2015Q1-base:1.12 pkgsrc-2014Q4:1.12.0.26 pkgsrc-2014Q4-base:1.12 pkgsrc-2014Q3:1.12.0.24 pkgsrc-2014Q3-base:1.12 pkgsrc-2014Q2:1.12.0.22 pkgsrc-2014Q2-base:1.12 pkgsrc-2014Q1:1.12.0.20 pkgsrc-2014Q1-base:1.12 pkgsrc-2013Q4:1.12.0.18 pkgsrc-2013Q4-base:1.12 pkgsrc-2013Q3:1.12.0.16 pkgsrc-2013Q3-base:1.12 pkgsrc-2013Q2:1.12.0.14 pkgsrc-2013Q2-base:1.12 pkgsrc-2013Q1:1.12.0.12 pkgsrc-2013Q1-base:1.12 pkgsrc-2012Q4:1.12.0.10 pkgsrc-2012Q4-base:1.12 pkgsrc-2012Q3:1.12.0.8 pkgsrc-2012Q3-base:1.12 pkgsrc-2012Q2:1.12.0.6 pkgsrc-2012Q2-base:1.12 pkgsrc-2012Q1:1.12.0.4 pkgsrc-2012Q1-base:1.12 pkgsrc-2011Q4:1.12.0.2 pkgsrc-2011Q4-base:1.12 pkgsrc-2011Q3:1.11.0.46 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.11.0.44 pkgsrc-2011Q2-base:1.11 pkgsrc-2011Q1:1.11.0.42 pkgsrc-2011Q1-base:1.11 pkgsrc-2010Q4:1.11.0.40 pkgsrc-2010Q4-base:1.11 pkgsrc-2010Q3:1.11.0.38 pkgsrc-2010Q3-base:1.11 pkgsrc-2010Q2:1.11.0.36 pkgsrc-2010Q2-base:1.11 pkgsrc-2010Q1:1.11.0.34 pkgsrc-2010Q1-base:1.11 pkgsrc-2009Q4:1.11.0.32 pkgsrc-2009Q4-base:1.11 pkgsrc-2009Q3:1.11.0.30 pkgsrc-2009Q3-base:1.11 pkgsrc-2009Q2:1.11.0.28 pkgsrc-2009Q2-base:1.11 pkgsrc-2009Q1:1.11.0.26 pkgsrc-2009Q1-base:1.11 pkgsrc-2008Q4:1.11.0.24 pkgsrc-2008Q4-base:1.11 pkgsrc-2008Q3:1.11.0.22 pkgsrc-2008Q3-base:1.11 cube-native-xorg:1.11.0.20 cube-native-xorg-base:1.11 pkgsrc-2008Q2:1.11.0.18 pkgsrc-2008Q2-base:1.11 cwrapper:1.11.0.16 pkgsrc-2008Q1:1.11.0.14 pkgsrc-2008Q1-base:1.11 pkgsrc-2007Q4:1.11.0.12 pkgsrc-2007Q4-base:1.11 pkgsrc-2007Q3:1.11.0.10 pkgsrc-2007Q3-base:1.11 pkgsrc-2007Q2:1.11.0.8 pkgsrc-2007Q2-base:1.11 pkgsrc-2007Q1:1.11.0.6 pkgsrc-2007Q1-base:1.11 pkgsrc-2006Q4:1.11.0.4 pkgsrc-2006Q4-base:1.11 pkgsrc-2006Q3:1.11.0.2 pkgsrc-2006Q3-base:1.11 pkgsrc-2006Q2:1.10.0.6 pkgsrc-2006Q2-base:1.10 pkgsrc-2006Q1:1.10.0.4 pkgsrc-2006Q1-base:1.10 pkgsrc-2005Q4:1.10.0.2 pkgsrc-2005Q4-base:1.10 pkgsrc-2005Q3:1.7.0.6 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.4 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.2 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.5.0.4 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.2 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.3.0.4 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.2 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.13 date 2018.11.29.13.58.59; author leot; state dead; branches; next 1.12; commitid dEwceO78LL5mqQ1B; 1.12 date 2011.11.07.12.14.15; author drochner; state Exp; branches; next 1.11; 1.11 date 2006.07.19.16.16.23; author rillig; state Exp; branches; next 1.10; 1.10 date 2005.11.04.20.11.47; author tv; state Exp; branches; next 1.9; 1.9 date 2005.11.02.00.45.02; author hiramatsu; state Exp; branches; next 1.8; 1.8 date 2005.10.10.16.35.45; author joerg; state Exp; branches; next 1.7; 1.7 date 2005.03.10.23.39.53; author rillig; state Exp; branches; next 1.6; 1.6 date 2005.01.11.13.37.54; author adam; state dead; branches; next 1.5; 1.5 date 2004.09.06.02.56.07; author rh; state Exp; branches; next 1.4; 1.4 date 2004.08.26.20.21.58; author recht; state Exp; branches; next 1.3; 1.3 date 2003.12.04.19.37.52; author xtraeme; state Exp; branches; next 1.2; 1.2 date 2003.02.15.12.00.41; author jmmv; state Exp; branches; next 1.1; 1.1 date 2001.11.14.23.17.10; author enami; state Exp; branches; next ; desc @@ 1.13 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-ab,v 1.12 2011/11/07 12:14:15 drochner Exp $ This patch makes imlib2 compile on systems that don't have an lround function, which is defined in C99. Needed at least for NetBSD-1.6.2 and NetBSD-2.0. --- src/lib/color_helpers.c.orig 2005-01-08 08:55:02.000000000 +0100 +++ src/lib/color_helpers.c 2006-07-19 18:11:42.222074773 +0200 @@@@ -1,4 +1,22 @@@@ +#include +#include + #include "color_helpers.h" + +#ifdef __DragonFly__ +#include +#endif + +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__INTERIX) || \ + (defined(__DragonFly__) && __DragonFly_version <= 130002) \ + || defined(__sun) && defined(__SunOS_5_8) +#define lround(x) my_lround(x) +static long my_lround(double x) +{ + return (long) ((x) >= 0 ? (x) + 0.5 : (x) - 0.5); +} +#endif + /* * Color space conversion helper routines * Convert between rgb and hsv and between rgb and hls @ 1.12 log @update to 1.4.5 changes: -bugfixes -cleanup, spelling fixes @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.11 2006/07/19 16:16:23 rillig Exp $ @ 1.11 log @Solaris 5.8 needs its own definition of lround(), too. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.10 2005/11/04 20:11:47 tv Exp $ d32 1 a32 1 * Convert between rgb and hsv adn between rgb and hls @ 1.10 log @Use my_lround() on Interix too. Add minimalist #ifndef blocks to rip out XShm support on Interix. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.9 2005/11/02 00:45:02 hiramatsu Exp $ d8 6 a13 3 --- src/lib/color_helpers.c.orig Sat Jan 8 16:55:02 2005 +++ src/lib/color_helpers.c Wed Nov 2 08:00:28 2005 @@@@ -1,4 +1,18 @@@@ d21 2 a22 1 + (defined(__DragonFly__) && __DragonFly_version <= 130002) @ 1.9 log @OpenBSD doesn't have lround. @ text @d1 1 a1 1 $NetBSD$ d17 1 a17 1 +#if defined(__NetBSD__) || defined(__OpenBSD__) || \ @ 1.8 log @Also use the lround workaround on older DragonFly systems. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.7 2005/03/10 23:39:53 rillig Exp $ d8 2 a9 2 --- src/lib/color_helpers.c.orig Sat Jan 8 08:55:02 2005 +++ src/lib/color_helpers.c Thu Mar 10 23:57:26 2005 d17 1 a17 1 +#if defined(__NetBSD__) || \ @ 1.7 log @Replaced the patch-aa (worked only with NetBSD-2.0) with patch-ab (works also with NetBSD-1.6.2). Bumped PKGREVISION, because the actual code changes. The patch is ugly (as usual), but small. Reviewed by christos. @ text @d1 1 a1 1 $NetBSD$ d10 1 a10 1 @@@@ -1,4 +1,13 @@@@ d13 6 a18 1 +#ifdef __NetBSD__ @ 1.6 log @Changes 1.2.0: * Source tree clean up * Bug fixes @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 2004/09/06 02:56:07 rh Exp $ d3 21 a23 11 --- filters/Makefile.in.orig 2004-08-31 05:23:10.000000000 +0200 +++ filters/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$(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/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) @ 1.5 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.4 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 --- loaders/Makefile.in.orig 2004-07-30 05:06:54.000000000 +0200 +++ loaders/Makefile.in 2004-08-26 20:29:16.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$(top_srcdir)/libltdl -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) @ 1.3 log @Updated to 1.1.0, provided by Min Sik Kim PR pkg/23630. Changes: o imlib2-1.1.0 uses freetype2 instead of freetype1. o More bugfixes, etc. @ text @d3 3 a5 3 --- loaders/Makefile.in.orig 2003-09-07 21:12:29.000000000 -0500 +++ loaders/Makefile.in @@@@ -99,7 +99,7 @@@@ AUTOMAKE_OPTIONS = 1.4 foreign d11 3 a13 3 INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src \ -I$(top_srcdir)/loaders -I$(top_srcdir)/libltdl \ -I/usr/X11R6/include $(X_CFLAGS) \ @ 1.2 log @Update to 1.0.6. Author only maintains a CVS ChangeLog that is very difficult to track for differences since 1.0.3... anyway, most changes seem to be bugfixes and performance improvements. This closes my own PR pkg/19144. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2001/11/14 23:17:10 enami Exp $ d3 1 a3 1 --- loaders/Makefile.in.orig Fri Apr 26 01:45:29 2002 d5 1 a5 1 @@@@ -92,7 +92,7 @@@@ AUTOMAKE_OPTIONS = 1.4 foreign d9 5 a13 5 -LDFLAGS = -L/usr/X11R6/lib -L$(top_builddir)/src +LDFLAGS = @@LDFLAGS@@ -L$(top_builddir)/src INCLUDES = -I/usr/X11R6/include -I$(top_srcdir)/libltdl $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/loaders @ 1.1 log @Make necessary rpath is embedded in shared objects by making LDFLAGS is substituted by configure instead of hardcoding. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- loaders/Makefile.in.orig Sun Apr 29 14:54:41 2001 d5 1 a5 1 @@@@ -93,7 +93,7 @@@@ d9 2 a10 2 -LDFLAGS = -L/usr/X11R6/lib -L$(top_srcdir)/src +LDFLAGS = @@LDFLAGS@@ -L$(top_srcdir)/src @