pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/liblqr graphics/liblqr: Remove inlines so dig...
details: https://anonhg.NetBSD.org/pkgsrc/rev/577974262236
branches: trunk
changeset: 348524:577974262236
user: rumko <rumko%pkgsrc.org@localhost>
date: Wed Jun 15 18:53:33 2016 +0000
description:
graphics/liblqr: Remove inlines so digikam and clang are happy.
Bump PKGREVISION.
diffstat:
graphics/liblqr/Makefile | 4 +-
graphics/liblqr/distinfo | 6 +-
graphics/liblqr/patches/patch-lqr_lqr__energy.c | 55 ++++++++++++++++++-
graphics/liblqr/patches/patch-lqr_lqr__energy__priv.h | 33 ++++++++--
4 files changed, 84 insertions(+), 14 deletions(-)
diffs (147 lines):
diff -r 5bf56c208120 -r 577974262236 graphics/liblqr/Makefile
--- a/graphics/liblqr/Makefile Wed Jun 15 18:38:07 2016 +0000
+++ b/graphics/liblqr/Makefile Wed Jun 15 18:53:33 2016 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2012/10/06 14:11:05 asau Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/15 18:53:33 rumko Exp $
#
DISTNAME= liblqr-1-0.4.1
PKGNAME= liblqr-0.4.1
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://liblqr.wikidot.com/local--files/en:download-page/
EXTRACT_SUFX= .tar.bz2
diff -r 5bf56c208120 -r 577974262236 graphics/liblqr/distinfo
--- a/graphics/liblqr/distinfo Wed Jun 15 18:38:07 2016 +0000
+++ b/graphics/liblqr/distinfo Wed Jun 15 18:53:33 2016 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 21:34:09 agc Exp $
+$NetBSD: distinfo,v 1.5 2016/06/15 18:53:33 rumko 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) = 8aa0db7648e9b9d022a34578a035e4ef5842b348
-SHA1 (patch-lqr_lqr__energy__priv.h) = 8efc263454d84be7ff70db9b148316177ba79196
+SHA1 (patch-lqr_lqr__energy.c) = bea20d1540dcb32c10bcbce4acab585760c961fc
+SHA1 (patch-lqr_lqr__energy__priv.h) = 822ca07f2c25c06c3701e5b4dd8950a1420cf280
diff -r 5bf56c208120 -r 577974262236 graphics/liblqr/patches/patch-lqr_lqr__energy.c
--- a/graphics/liblqr/patches/patch-lqr_lqr__energy.c Wed Jun 15 18:38:07 2016 +0000
+++ b/graphics/liblqr/patches/patch-lqr_lqr__energy.c Wed Jun 15 18:53:33 2016 +0000
@@ -1,10 +1,34 @@
-$NetBSD: patch-lqr_lqr__energy.c,v 1.1 2012/06/01 21:59:27 wiz Exp $
+$NetBSD: patch-lqr_lqr__energy.c,v 1.2 2016/06/15 18:53:33 rumko Exp $
-Needed by gimp-liquid-rescale with clang, otherwise:
+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
}
}
@@ -14,3 +38,30 @@
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 -r 5bf56c208120 -r 577974262236 graphics/liblqr/patches/patch-lqr_lqr__energy__priv.h
--- a/graphics/liblqr/patches/patch-lqr_lqr__energy__priv.h Wed Jun 15 18:38:07 2016 +0000
+++ b/graphics/liblqr/patches/patch-lqr_lqr__energy__priv.h Wed Jun 15 18:53:33 2016 +0000
@@ -1,16 +1,35 @@
-$NetBSD: patch-lqr_lqr__energy__priv.h,v 1.1 2012/06/01 21:59:27 wiz Exp $
+$NetBSD: patch-lqr_lqr__energy__priv.h,v 1.2 2016/06/15 18:53:33 rumko Exp $
-Needed by gimp-liquid-rescale with clang, otherwise:
+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
-@@ -40,7 +40,7 @@
+@@ -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_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);
+-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);
Home |
Main Index |
Thread Index |
Old Index