liblqr: updated to 0.4.2

0.4.2:
This new version of the library fixes a couple of bugs (some small memory leaks, installation issues on MacOSX). It's avaliable at the download page, as usual.

4 files changed, 16 insertions, 122 deletions

diff --git a/graphics/liblqr/Makefile b/graphics/liblqr/Makefile
index d9064c6a3c2..1c026697728 100644
--- a/graphics/liblqr/Makefile
+++ b/graphics/liblqr/Makefile
@@ -1,22 +1,20 @@
-# $NetBSD: Makefile,v 1.9 2016/06/15 18:53:33 rumko Exp $
-#
+# $NetBSD: Makefile,v 1.10 2019/12/15 21:32:05 adam Exp $
 
-DISTNAME=		liblqr-1-0.4.1
-PKGNAME=		liblqr-0.4.1
-PKGREVISION=		6
-CATEGORIES=		graphics
-MASTER_SITES=		http://liblqr.wikidot.com/local--files/en:download-page/
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	liblqr-1-0.4.2
+PKGNAME=	${DISTNAME:S/-1-/-/}
+CATEGORIES=	graphics
+MASTER_SITES=	http://liblqr.wikidot.com/local--files/en:download-page/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://liblqr.wikidot.com/
-COMMENT=		Content-aware image resizing library
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://liblqr.wikidot.com/
+COMMENT=	Content-aware image resizing library
 # examples are GPL, library is LGPL, AFAICT
-LICENSE=		gnu-gpl-v3 AND gnu-lgpl-v3
+LICENSE=	gnu-gpl-v3 AND gnu-lgpl-v3
 
-GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE=	lqr-1.pc.in
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/graphics/liblqr/distinfo b/graphics/liblqr/distinfo
index 67d63c2999c..5fee2062e98 100644
--- a/graphics/liblqr/distinfo
+++ b/graphics/liblqr/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2016/06/15 18:53:33 rumko Exp $
+$NetBSD: distinfo,v 1.6 2019/12/15 21:32:05 adam Exp $
 
-SHA1 (liblqr-1-0.4.1.tar.bz2) = 42b30b157b0c47690baa847847e24c7c94412b75
-RMD160 (liblqr-1-0.4.1.tar.bz2) = d0b43084cb63c34b01c988b6293d16d8859dc0d6
-SHA512 (liblqr-1-0.4.1.tar.bz2) = 1f923a1745c30c3e8033602882bbab4160464192646779b5a7c1adff80253f21e6f4e2a516ad3cee061d5c62fb57c606691fb2ed3d9033c3c610e8ed3a6f6c66
-Size (liblqr-1-0.4.1.tar.bz2) = 347474 bytes
-SHA1 (patch-lqr_lqr__energy.c) = bea20d1540dcb32c10bcbce4acab585760c961fc
-SHA1 (patch-lqr_lqr__energy__priv.h) = 822ca07f2c25c06c3701e5b4dd8950a1420cf280
+SHA1 (liblqr-1-0.4.2.tar.bz2) = 69639f7dc56a084f59a3198f3a8d72e4a73ff927
+RMD160 (liblqr-1-0.4.2.tar.bz2) = e69cf09ffeca3b426d5905a4a26b289c383e5260
+SHA512 (liblqr-1-0.4.2.tar.bz2) = 57d9ed67d5a11c970262263a34b6797576088e14f2ccb01b393eff55bfd22c8bb2b2189e3ed5ff6c187f709c556225fc1fb1038bd0d7e0c03d8839ef0ce998a3
+Size (liblqr-1-0.4.2.tar.bz2) = 344739 bytes
diff --git a/graphics/liblqr/patches/patch-lqr_lqr__energy.c b/graphics/liblqr/patches/patch-lqr_lqr__energy.c
deleted file mode 100644
index b12701ea341..00000000000
--- a/graphics/liblqr/patches/patch-lqr_lqr__energy.c
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-lqr_lqr__energy.c,v 1.2 2016/06/15 18:53:33 rumko Exp $
-
-Needed by gimp-liquid-rescale and digikam with clang, otherwise:
-graphics/gimp-liquid-rescale/work/.buildlink/lib/liblqr-1.so: undefined reference to `lqr_pixel_get_rgbcol'
-graphics/digikam/work/.buildlink/lib/liblqr-1.so: undefined reference to `lqr_carver_read_brightness_grey'
-graphics/digikam/work/.buildlink/lib/liblqr-1.so: undefined reference to `lqr_pixel_get_norm'
-graphics/digikam/work/.buildlink/lib/liblqr-1.so: undefined reference to `lqr_carver_read_brightness_std'
-graphics/digikam/work/.buildlink/lib/liblqr-1.so: undefined reference to `lqr_carver_read_brightness_grey'
-
-See https://github.com/carlobaldassi/liblqr/commit/bab7911bce2ea50e1a4db739518fbf7aabfd6888
-
---- lqr/lqr_energy.c.orig	2009-05-11 00:08:03.000000000 +0000
-+++ lqr/lqr_energy.c
-@@ -44,7 +44,7 @@
- 
- /* read normalised pixel value from
-  * rgb buffer at the given index */
--inline gdouble
-+gdouble
- lqr_pixel_get_norm(void *rgb, gint rgb_ind, LqrColDepth col_depth)
- {
-     switch (col_depth) {
-@@ -66,7 +66,7 @@ lqr_pixel_get_norm(void *rgb, gint rgb_i
- 
- /* write pixel from normalised value
-  * in rgb buffer at the given index */
--inline void
-+void
- lqr_pixel_set_norm(gdouble val, void *rgb, gint rgb_ind, LqrColDepth col_depth)
- {
-     switch (col_depth) {
-@@ -90,7 +90,7 @@ lqr_pixel_set_norm(gdouble val, void *rg
-     }
- }
- 
--inline gdouble
-+gdouble
- lqr_pixel_get_rgbcol(void *rgb, gint rgb_ind, LqrColDepth col_depth, LqrImageType image_type, gint channel)
- {
-     gdouble black_fact = 0;
-@@ -115,7 +115,7 @@ lqr_pixel_get_rgbcol(void *rgb, gint rgb
-     }
- }
- 
--inline gdouble
-+gdouble
- lqr_carver_read_brightness_grey(LqrCarver *r, gint x, gint y)
- {
-     gint now = r->raw[y][x];
-@@ -123,7 +123,7 @@ lqr_carver_read_brightness_grey(LqrCarve
-     return lqr_pixel_get_norm(r->rgb, rgb_ind, r->col_depth);
- }
- 
--inline gdouble
-+gdouble
- lqr_carver_read_brightness_std(LqrCarver *r, gint x, gint y)
- {
-     gdouble red, green, blue;
-@@ -205,7 +205,7 @@ lqr_carver_read_brightness(LqrCarver *r,
-     return bright * alpha_fact;
- }
- 
--inline gdouble
-+gdouble
- lqr_carver_read_luma_std(LqrCarver *r, gint x, gint y)
- {
-     gdouble red, green, blue;
diff --git a/graphics/liblqr/patches/patch-lqr_lqr__energy__priv.h b/graphics/liblqr/patches/patch-lqr_lqr__energy__priv.h
deleted file mode 100644
index 4d31cec2939..00000000000
--- a/graphics/liblqr/patches/patch-lqr_lqr__energy__priv.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-lqr_lqr__energy__priv.h,v 1.2 2016/06/15 18:53:33 rumko Exp $
-
-Needed by gimp-liquid-rescale and digikam with clang, otherwise:
-graphics/gimp-liquid-rescale/work/.buildlink/lib/liblqr-1.so: undefined reference to `lqr_pixel_get_rgbcol'
-graphics/digikam/work/.buildlink/lib/liblqr-1.so: undefined reference to `lqr_carver_read_brightness_grey'
-graphics/digikam/work/.buildlink/lib/liblqr-1.so: undefined reference to `lqr_pixel_get_norm'
-graphics/digikam/work/.buildlink/lib/liblqr-1.so: undefined reference to `lqr_carver_read_brightness_std'
-graphics/digikam/work/.buildlink/lib/liblqr-1.so: undefined reference to `lqr_carver_read_brightness_grey'
-
-https://github.com/carlobaldassi/liblqr/commit/bab7911bce2ea50e1a4db739518fbf7aabfd6888
-
---- lqr/lqr_energy_priv.h.orig	2009-05-11 00:08:03.000000000 +0000
-+++ lqr/lqr_energy_priv.h
-@@ -38,15 +38,15 @@
- #define LQR_SATURATE_(x) (1 / (1 + (1 / (x))))
- #define LQR_SATURATE(x) ((x) >= 0 ? LQR_SATURATE_(x) : -LQR_SATURATE_(-x))
- 
--inline gdouble lqr_pixel_get_norm(void *src, gint src_ind, LqrColDepth col_depth);
--inline void lqr_pixel_set_norm(gdouble val, void *rgb, gint rgb_ind, LqrColDepth col_depth);
--inline gdouble lqr_pixel_get_rgbcol(void *rgb, gint rgb_ind, LqrColDepth col_depth, LqrImageType image_type,
-+gdouble lqr_pixel_get_norm(void *src, gint src_ind, LqrColDepth col_depth);
-+void lqr_pixel_set_norm(gdouble val, void *rgb, gint rgb_ind, LqrColDepth col_depth);
-+gdouble lqr_pixel_get_rgbcol(void *rgb, gint rgb_ind, LqrColDepth col_depth, LqrImageType image_type,
-                                     gint channel);
--inline gdouble lqr_carver_read_brightness_grey(LqrCarver *r, gint x, gint y);
--inline gdouble lqr_carver_read_brightness_std(LqrCarver *r, gint x, gint y);
-+gdouble lqr_carver_read_brightness_grey(LqrCarver *r, gint x, gint y);
-+gdouble lqr_carver_read_brightness_std(LqrCarver *r, gint x, gint y);
- gdouble lqr_carver_read_brightness_custom(LqrCarver *r, gint x, gint y);
- inline gdouble lqr_carver_read_brightness(LqrCarver *r, gint x, gint y);
--inline gdouble lqr_carver_read_luma_std(LqrCarver *r, gint x, gint y);
-+gdouble lqr_carver_read_luma_std(LqrCarver *r, gint x, gint y);
- inline gdouble lqr_carver_read_luma(LqrCarver *r, gint x, gint y);
- inline gdouble lqr_carver_read_rgba(LqrCarver *r, gint x, gint y, gint channel);
- inline gdouble lqr_carver_read_custom(LqrCarver *r, gint x, gint y, gint channel);