[pkgsrc/trunk]: pkgsrc/graphics/imlib2 imlib2: Update to 1.6.1

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aed3507e8661
branches:  trunk
changeset: 423560:aed3507e8661
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Feb 20 15:14:56 2020 +0000

description:
imlib2: Update to 1.6.1

***
*** Version 1.6.1 ***
***

Kim Woelders (11):
      gz loader: Use FILE, not fd
      gz, bz2 loaders: Fix recent breakage when file name has more than two dots
      Quit on 'q' or 'esc' key press in all imlib2_... test utilities
      Rename imlib2_test_load to imlib2_load
      imlib2_load: Optionally write to stderr instead of stdout
      imlib2_view: Add progress debug options
      Enable specifying loader/filter paths with environment variables
      BMP loader: Remove some bogus conditions
      XPM loader: Minor optimization for cpp > 2
      LBM loader: Fix header-only loading
      1.6.1

Luiz Carlos Ramos (1):
      BMP loader: Fix size calculation when saving files


***
*** Version 1.6.0 ***
***

Alexander Volkov (1):
      Allow to use custom memory management functions for loaded images

Kim Woelders (64):
      Add __imlib_LoadImageWrapper() handling all load() calls
      imlib2_conv: Report error on save failure
      Autofoo cosmetics
      Trivial cleanups in imlib2_... test programs
      Add imlib2_test_load program
      Cleanups in load() functions
      Centralize handling of im->format
      Sort loaders in Makefile.am
      Remove obsolete dmalloc stuff
      Move SWAP.. macro definitions to common.h
      Use common PIXEL_ARGB() macro to compose pixels
      Add new ICO loader
      Spec file simlifications and cleanups
      Fix memory leak in imlib_list_fonts()
      XPM loader: Refactor exit cleanup handling
      XPM loader: Fix potentially uninitialized pixel data
      XPM loader: Fixup after "Refactor exit cleanup handling"
      Revert "XPM loader: Fix potentially uninitialized pixel data"
      XPM loader: Cosmetics (reduce indent level)
      XPM loader: Fix several colormap issues
      XPM loader: Simplify pixel value handling
      XPM loader: Add missing pixels (malformed xpm)
      XPM loader: More simplifications
      JPG loader: Refactor
      JPG loader: Do proper CMYK conversion
      Add new WebP loader
      Remove pointless im->data checks in loaders
      WepP loader: Fix memory leak in error path
      JPG loader: Fix memory leaks in error paths
      Fix ABI break
      ICO loader: Add binary flag to fopen()
      JPG loader: Refactor error handling
      Rename/add byte swap macros
      BMP loader: Major makeover - numerous bug fixes and feature enhancements
      Miscellaneous imlib_test_load tweaks
      GZIP loader: Check filename before uncompress
      imlib2_test_load: Fixup after recent change
      Re-indent everything using indent-2.2.12
      TGA loader: Refactor
      Eliminate WRITE_RGBA()
      Simplify autogen.sh
      Simplify pixel color handling in api.c
      Use pixel instead of r,b,g,a in __imlib_render_str()
      Use macro for pixel color access in savers
      Eliminate READ_RGBA()
      XPM loader: Accept signature not at the very start of the file
      Simplify loader lookup functions
      imlib2_view: Enable selecting next/prev using keys too
      imlib2_view: Fix event processing bug
      imlib2_test_load: Fixup recent breakage for real
      imlib2_test_load: Check progress conditionally
      imlib2_view: Add verbose option, quit on Escape too
      TGA loader - Mostly cosmetic refactoring
      TGA loader: More mostly cosmetic changes
      TGA loader: Support horiontal flip
      TGA loader: Add simple 16 bpp handling
      TGA loader: Tweak error handling
      ICO loader: Fix non-immediate loading
      Remove __imlib_AllocateData() w,h args
      imlib2_view: Fix next/prev selection if last/first image is bad
      ICO loader: Fix memory leak in error path
      XPM loader: Correct signature check (avoid accessing unset data)
      gz, bz2 loaders: Simplify, eliminate unnecessary strdups, cosmetics
      1.6.0.

diffstat:

 graphics/imlib2/Makefile                             |   7 ++++---
 graphics/imlib2/PLIST                                |   4 +++-
 graphics/imlib2/distinfo                             |  11 ++++++-----
 graphics/imlib2/patches/patch-src_bin_imlib2__view.c |  14 ++++++++++++++
 4 files changed, 27 insertions(+), 9 deletions(-)

diffs (87 lines):

diff -r 5b1176c1cdc4 -r aed3507e8661 graphics/imlib2/Makefile
--- a/graphics/imlib2/Makefile  Thu Feb 20 14:59:12 2020 +0000
+++ b/graphics/imlib2/Makefile  Thu Feb 20 15:14:56 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.76 2018/11/29 13:58:58 leot Exp $
+# $NetBSD: Makefile,v 1.77 2020/02/20 15:14:56 nia Exp $
 
-DISTNAME=      imlib2-1.5.1
+DISTNAME=      imlib2-1.6.1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 EXTRACT_SUFX=  .tar.bz2
@@ -26,12 +26,13 @@
 SHLIB_SUFFIX=          so
 .endif
 
-SUBST_CLASSES+=                shlib rpath
+SUBST_CLASSES+=                shlib
 SUBST_STAGE.shlib=     pre-configure
 SUBST_MESSAGE.shlib=   Replacing shared library suffix
 SUBST_FILES.shlib+=    src/lib/image.c
 SUBST_SED.shlib+=      -e 's,"\.so",".${SHLIB_SUFFIX}",'
 
+SUBST_CLASSES+=                rpath
 SUBST_STAGE.rpath=     pre-configure
 SUBST_MESSAGE.rpath=   Replacing COMPILER_RPATH_FLAG
 SUBST_FILES.rpath=     imlib2-config.in
diff -r 5b1176c1cdc4 -r aed3507e8661 graphics/imlib2/PLIST
--- a/graphics/imlib2/PLIST     Thu Feb 20 14:59:12 2020 +0000
+++ b/graphics/imlib2/PLIST     Thu Feb 20 15:14:56 2020 +0000
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2016/05/01 20:58:41 leot Exp $
+@comment $NetBSD: PLIST,v 1.13 2020/02/20 15:14:56 nia Exp $
 bin/imlib2-config
 ${PLIST.x11}bin/imlib2_bumpmap
 ${PLIST.x11}bin/imlib2_colorspace
 bin/imlib2_conv
 ${PLIST.x11}bin/imlib2_grab
+bin/imlib2_load
 ${PLIST.x11}bin/imlib2_poly
 ${PLIST.x11}bin/imlib2_show
 ${PLIST.x11}bin/imlib2_test
@@ -17,6 +18,7 @@
 lib/imlib2/loaders/bz2.la
 lib/imlib2/loaders/ff.la
 lib/imlib2/loaders/gif.la
+lib/imlib2/loaders/ico.la
 lib/imlib2/loaders/jpeg.la
 lib/imlib2/loaders/lbm.la
 lib/imlib2/loaders/png.la
diff -r 5b1176c1cdc4 -r aed3507e8661 graphics/imlib2/distinfo
--- a/graphics/imlib2/distinfo  Thu Feb 20 14:59:12 2020 +0000
+++ b/graphics/imlib2/distinfo  Thu Feb 20 15:14:56 2020 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.39 2018/11/29 13:58:58 leot Exp $
+$NetBSD: distinfo,v 1.40 2020/02/20 15:14:56 nia Exp $
 
-SHA1 (imlib2-1.5.1.tar.bz2) = 3e97e7157380f0cfbdf4f3c950a7a00bdfa6072c
-RMD160 (imlib2-1.5.1.tar.bz2) = 10afbce09a9e710beaadf04cce76e9885024dfd6
-SHA512 (imlib2-1.5.1.tar.bz2) = f9d971674887d4af067c6921e34b6fe598db0317052bc864b676c526b36373ce021d9d49cad95aa64dbbd8e74f1831ddf3ed105900e3df2b66a6b53f7f27c732
-Size (imlib2-1.5.1.tar.bz2) = 919810 bytes
+SHA1 (imlib2-1.6.1.tar.bz2) = 3b5f850e83cbb7481e33061348fb9c7a555c8c60
+RMD160 (imlib2-1.6.1.tar.bz2) = 3e3d6fe5d6295f74abd4fa6c8d1e501368645f2c
+SHA512 (imlib2-1.6.1.tar.bz2) = ecdbdbfe8767ec2b1f22ce664cbab5e1d3f75be7a3c8f37488f5243b3c31dbc433414b8d50d2d1b70c67a80e31e42cc5398161991ce3955e991c114c82ddd58f
+Size (imlib2-1.6.1.tar.bz2) = 893119 bytes
 SHA1 (patch-imlib2-config.in) = 22bd429a029e1071f1920ed2261cb94fd66b1146
+SHA1 (patch-src_bin_imlib2__view.c) = 53a7bdb2e1f8687db095b796b46945ee5a72f552
 SHA1 (patch-src_lib_amd64__blend.S) = 09e89c6b1d6fb622b3ee88f6c3a5e9b6f3ab3fad
 SHA1 (patch-src_lib_amd64__blend__cmod.S) = d533eeacd4b196086f1854c657d3e0773596790b
diff -r 5b1176c1cdc4 -r aed3507e8661 graphics/imlib2/patches/patch-src_bin_imlib2__view.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/imlib2/patches/patch-src_bin_imlib2__view.c      Thu Feb 20 15:14:56 2020 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_bin_imlib2__view.c,v 1.1 2020/02/20 15:14:57 nia Exp $
+
+Include sys/time.h for timeval.
+
+--- src/bin/imlib2_view.c.orig 2019-12-11 17:55:27.000000000 +0000
++++ src/bin/imlib2_view.c
+@@ -2,6 +2,7 @@
+ 
+ #include <X11/Xlib.h>
+ #include <X11/keysym.h>
++#include <sys/time.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>