[pkgsrc/trunk]: pkgsrc/graphics/liblqr Remove inline so gimp-liquid-rescale a...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6564c0695e67
branches:  trunk
changeset: 604546:6564c0695e67
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jun 01 21:59:27 2012 +0000

description:
Remove inline so gimp-liquid-rescale and clang are happy.
Bump PKGREVISION.

While here, set LICENSE.

diffstat:

 graphics/liblqr/Makefile                              |   6 ++++--
 graphics/liblqr/distinfo                              |   4 +++-
 graphics/liblqr/patches/patch-lqr_lqr__energy.c       |  16 ++++++++++++++++
 graphics/liblqr/patches/patch-lqr_lqr__energy__priv.h |  16 ++++++++++++++++
 4 files changed, 39 insertions(+), 3 deletions(-)

diffs (76 lines):

diff -r 31785bc6d703 -r 6564c0695e67 graphics/liblqr/Makefile
--- a/graphics/liblqr/Makefile  Fri Jun 01 21:24:57 2012 +0000
+++ b/graphics/liblqr/Makefile  Fri Jun 01 21:59:27 2012 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2012/03/03 00:11:58 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/06/01 21:59:27 wiz Exp $
 #
 
 DISTNAME=              liblqr-1-0.4.1
 PKGNAME=               liblqr-0.4.1
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            graphics
 MASTER_SITES=          http://liblqr.wikidot.com/local--files/en:download-page/
 EXTRACT_SUFX=          .tar.bz2
@@ -11,6 +11,8 @@
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 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
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 GNU_CONFIGURE=         yes
diff -r 31785bc6d703 -r 6564c0695e67 graphics/liblqr/distinfo
--- a/graphics/liblqr/distinfo  Fri Jun 01 21:24:57 2012 +0000
+++ b/graphics/liblqr/distinfo  Fri Jun 01 21:59:27 2012 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/05/22 20:30:50 tnn Exp $
+$NetBSD: distinfo,v 1.3 2012/06/01 21:59:27 wiz Exp $
 
 SHA1 (liblqr-1-0.4.1.tar.bz2) = 42b30b157b0c47690baa847847e24c7c94412b75
 RMD160 (liblqr-1-0.4.1.tar.bz2) = d0b43084cb63c34b01c988b6293d16d8859dc0d6
 Size (liblqr-1-0.4.1.tar.bz2) = 347474 bytes
+SHA1 (patch-lqr_lqr__energy.c) = 8aa0db7648e9b9d022a34578a035e4ef5842b348
+SHA1 (patch-lqr_lqr__energy__priv.h) = 8efc263454d84be7ff70db9b148316177ba79196
diff -r 31785bc6d703 -r 6564c0695e67 graphics/liblqr/patches/patch-lqr_lqr__energy.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/liblqr/patches/patch-lqr_lqr__energy.c   Fri Jun 01 21:59:27 2012 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-lqr_lqr__energy.c,v 1.1 2012/06/01 21:59:27 wiz Exp $
+
+Needed by gimp-liquid-rescale with clang, otherwise:
+graphics/gimp-liquid-rescale/work/.buildlink/lib/liblqr-1.so: undefined reference to `lqr_pixel_get_rgbcol'
+
+--- lqr/lqr_energy.c.orig      2009-05-11 00:08:03.000000000 +0000
++++ lqr/lqr_energy.c
+@@ -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;
diff -r 31785bc6d703 -r 6564c0695e67 graphics/liblqr/patches/patch-lqr_lqr__energy__priv.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/liblqr/patches/patch-lqr_lqr__energy__priv.h     Fri Jun 01 21:59:27 2012 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-lqr_lqr__energy__priv.h,v 1.1 2012/06/01 21:59:27 wiz Exp $
+
+Needed by gimp-liquid-rescale with clang, otherwise:
+graphics/gimp-liquid-rescale/work/.buildlink/lib/liblqr-1.so: undefined reference to `lqr_pixel_get_rgbcol'
+
+--- lqr/lqr_energy_priv.h.orig 2009-05-11 00:08:03.000000000 +0000
++++ lqr/lqr_energy_priv.h
+@@ -40,7 +40,7 @@
+ 
+ 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_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);