Fri Jun 1 21:59:27 2012 UTC ()
Remove inline so gimp-liquid-rescale and clang are happy.
Bump PKGREVISION.

While here, set LICENSE.


(wiz)
diff -r1.5 -r1.6 pkgsrc/graphics/liblqr/Makefile
diff -r1.2 -r1.3 pkgsrc/graphics/liblqr/distinfo
diff -r0 -r1.1 pkgsrc/graphics/liblqr/patches/patch-lqr_lqr__energy.c
diff -r0 -r1.1 pkgsrc/graphics/liblqr/patches/patch-lqr_lqr__energy__priv.h
cvs diff -r1.5 -r1.6 pkgsrc/graphics/liblqr/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/liblqr/Makefile 2012/03/03 00:11:58 1.5
+++ pkgsrc/graphics/liblqr/Makefile 2012/06/01 21:59:27 1.6
@@ -1,22 +1,24 @@ @@ -1,22 +1,24 @@
1# $NetBSD: Makefile,v 1.5 2012/03/03 00:11:58 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2012/06/01 21:59:27 wiz Exp $
2# 2#
3 3
4DISTNAME= liblqr-1-0.4.1 4DISTNAME= liblqr-1-0.4.1
5PKGNAME= liblqr-0.4.1 5PKGNAME= liblqr-0.4.1
6PKGREVISION= 3 6PKGREVISION= 4
7CATEGORIES= graphics 7CATEGORIES= graphics
8MASTER_SITES= http://liblqr.wikidot.com/local--files/en:download-page/ 8MASTER_SITES= http://liblqr.wikidot.com/local--files/en:download-page/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://liblqr.wikidot.com/ 12HOMEPAGE= http://liblqr.wikidot.com/
13COMMENT= Content-aware image resizing library 13COMMENT= Content-aware image resizing library
 14# examples are GPL, library is LGPL, AFAICT
 15LICENSE= gnu-gpl-v3 AND gnu-lgpl-v3
14 16
15PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
16GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
17USE_TOOLS+= pkg-config 19USE_TOOLS+= pkg-config
18USE_LIBTOOL= yes 20USE_LIBTOOL= yes
19PKGCONFIG_OVERRIDE= lqr-1.pc.in 21PKGCONFIG_OVERRIDE= lqr-1.pc.in
20 22
21.include "../../devel/glib2/buildlink3.mk" 23.include "../../devel/glib2/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/graphics/liblqr/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/liblqr/distinfo 2009/05/22 20:30:50 1.2
+++ pkgsrc/graphics/liblqr/distinfo 2012/06/01 21:59:27 1.3
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
1$NetBSD: distinfo,v 1.2 2009/05/22 20:30:50 tnn Exp $ 1$NetBSD: distinfo,v 1.3 2012/06/01 21:59:27 wiz Exp $
2 2
3SHA1 (liblqr-1-0.4.1.tar.bz2) = 42b30b157b0c47690baa847847e24c7c94412b75 3SHA1 (liblqr-1-0.4.1.tar.bz2) = 42b30b157b0c47690baa847847e24c7c94412b75
4RMD160 (liblqr-1-0.4.1.tar.bz2) = d0b43084cb63c34b01c988b6293d16d8859dc0d6 4RMD160 (liblqr-1-0.4.1.tar.bz2) = d0b43084cb63c34b01c988b6293d16d8859dc0d6
5Size (liblqr-1-0.4.1.tar.bz2) = 347474 bytes 5Size (liblqr-1-0.4.1.tar.bz2) = 347474 bytes
 6SHA1 (patch-lqr_lqr__energy.c) = 8aa0db7648e9b9d022a34578a035e4ef5842b348
 7SHA1 (patch-lqr_lqr__energy__priv.h) = 8efc263454d84be7ff70db9b148316177ba79196
File Added: pkgsrc/graphics/liblqr/patches/Attic/patch-lqr_lqr__energy.c
$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;
File Added: pkgsrc/graphics/liblqr/patches/Attic/patch-lqr_lqr__energy__priv.h
$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);