From e1f9b6e2e4dc6018179671ec31930be9668d45f9 Mon Sep 17 00:00:00 2001 From: gdt Date: Tue, 27 Sep 2005 00:31:18 +0000 Subject: update to 0.5: 25/09/2005 - UFRaw-0.5 released, based on DCRaw v7.65. * Read support for Nikon Tone Curve (NTC/NCV) files. * Added a curve editor. * Added control on the base curve (see the user guide for more information). * Support the new DCRaw color matrices for better color rendering. * More controls can be set from the command-line. * Preliminary EXIF support. * New UFRaw ID files contain all the conversion parameters and allow for batch conversion. * New 'ufraw-batch' replaces 'ufraw --batch'. * Numerous other changes. * Notice that the new Adaptive Homogeneity-Directed interpolation is still not enabled. Also, adds desktop file, and standalone nikon curve program. The standalone dcraw that can be built with ufraw is not installed. --- graphics/gimp-ufraw/Makefile | 18 +++++++++++------- graphics/gimp-ufraw/PLIST | 11 ++++++++++- graphics/gimp-ufraw/distinfo | 13 +++++-------- graphics/gimp-ufraw/patches/patch-aa | 25 ++++++++++++------------- graphics/gimp-ufraw/patches/patch-ab | 29 ----------------------------- graphics/gimp-ufraw/patches/patch-ac | 15 --------------- graphics/gimp-ufraw/patches/patch-ad | 16 ---------------- 7 files changed, 38 insertions(+), 89 deletions(-) delete mode 100644 graphics/gimp-ufraw/patches/patch-ab delete mode 100644 graphics/gimp-ufraw/patches/patch-ac delete mode 100644 graphics/gimp-ufraw/patches/patch-ad diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile index 8a37429c373..f0c5b596c60 100644 --- a/graphics/gimp-ufraw/Makefile +++ b/graphics/gimp-ufraw/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:17 jlam Exp $ -# +# $NetBSD: Makefile,v 1.9 2005/09/27 00:31:18 gdt Exp $ -DISTNAME= ufraw-0.4 -PKGNAME= gimp-ufraw-0.4 +DISTNAME= ufraw-0.5 +PKGNAME= gimp-${DISTNAME} CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ufraw/} @@ -10,12 +9,17 @@ MAINTAINER= gdt@NetBSD.org HOMEPAGE= http://ufraw.sourceforge.net/ COMMENT= GIMP plug-in for raw digicam import +GNU_CONFIGURE= yes + USE_TOOLS+= gmake pkg-config -BUILD_TARGET= build -INSTALL_TARGET= install-admin +USE_TOOLS+= perl:run pod2man BUILDLINK_TRANSFORM+= rm:-std=gnu99 +CONFIGURE_ARGS+= --enable-extras + +.include "../../graphics/jpeg/buildlink3.mk" +.include "../../graphics/libexif/buildlink3.mk" +.include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/gimp/buildlink3.mk" -.include "../../graphics/lcms/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gimp-ufraw/PLIST b/graphics/gimp-ufraw/PLIST index 08b135b01fa..bd83b0286df 100644 --- a/graphics/gimp-ufraw/PLIST +++ b/graphics/gimp-ufraw/PLIST @@ -1,3 +1,12 @@ -@comment $NetBSD: PLIST,v 1.2 2005/04/01 13:02:28 drochner Exp $ +@comment $NetBSD: PLIST,v 1.3 2005/09/27 00:31:18 gdt Exp $ +bin/dcraw +bin/nikon-curve bin/ufraw +bin/ufraw-batch +bin/ufraw-exif lib/gimp/2.0/plug-ins/ufraw-gimp +man/man1/ufraw.1 +share/applications/ufraw.desktop +share/pixmaps/ufraw.png +@dirrm share/pixmaps +@dirrm share/applications diff --git a/graphics/gimp-ufraw/distinfo b/graphics/gimp-ufraw/distinfo index a3a0b8bc96e..ab88e2435a6 100644 --- a/graphics/gimp-ufraw/distinfo +++ b/graphics/gimp-ufraw/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.7 2005/04/25 16:52:10 wiz Exp $ +$NetBSD: distinfo,v 1.8 2005/09/27 00:31:18 gdt Exp $ -SHA1 (ufraw-0.4.tar.gz) = dd907171f6e3b0055499f108ba212465839d6f89 -RMD160 (ufraw-0.4.tar.gz) = e1a8106305fcc2b5405344cdca28c0fa503dcb66 -Size (ufraw-0.4.tar.gz) = 101409 bytes -SHA1 (patch-aa) = 4268efb3c00ac5517f6c27d8bcd84d42293f6345 -SHA1 (patch-ab) = 5def994eac734aaf1edf02138e5af29f880b77f3 -SHA1 (patch-ac) = e34fe4f2f6878dbc24a401a5c6b95363b78c3d30 -SHA1 (patch-ad) = bc2183adb63d35f42b6c0d6e77b77e3884d37c3b +SHA1 (ufraw-0.5.tar.gz) = dc6d89157acd25d84ee48148772d6800dfb4eb1c +RMD160 (ufraw-0.5.tar.gz) = 5cfe6be92507b81996d98fa6ddedc1de34a1ba52 +Size (ufraw-0.5.tar.gz) = 284234 bytes +SHA1 (patch-aa) = 1ef87b4f0429b01338957b2e0203fd7cb95f08e1 diff --git a/graphics/gimp-ufraw/patches/patch-aa b/graphics/gimp-ufraw/patches/patch-aa index 04986eba4ce..697b31d3a37 100644 --- a/graphics/gimp-ufraw/patches/patch-aa +++ b/graphics/gimp-ufraw/patches/patch-aa @@ -1,14 +1,13 @@ -$NetBSD: patch-aa,v 1.1 2005/04/13 13:59:10 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2005/09/27 00:31:18 gdt Exp $ ---- ufraw.c.orig 2005-02-08 15:04:59.000000000 +0000 -+++ ufraw.c -@@ -630,8 +630,8 @@ int ufraw_saver(GtkWidget *widget, gpoin - #ifndef NO_TIFF - void ufraw_tiff_message(const char *module, const char *fmt, va_list ap) - { -- module = module; - char buf[max_path]; -+ module = module; - vsnprintf(buf, max_path, fmt, ap); - ufraw_message(UFRAW_VERBOSE, buf); - } +--- Makefile.in.orig 2005-09-24 21:37:15.000000000 -0400 ++++ Makefile.in +@@ -140,7 +140,7 @@ sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + @MAKE_EXTRAS_FALSE@bin_PROGRAMS = ufraw ufraw-batch +-@MAKE_EXTRAS_TRUE@bin_PROGRAMS = ufraw ufraw-batch dcraw nikon-curve ufraw-exif ++@MAKE_EXTRAS_TRUE@bin_PROGRAMS = ufraw ufraw-batch nikon-curve ufraw-exif + + @MAKE_GIMP_TRUE@gimpbin_PROGRAMS = ufraw-gimp + @MAKE_GIMP_TRUE@gimpbindir = $(GIMP_LIBDIR)/plug-ins diff --git a/graphics/gimp-ufraw/patches/patch-ab b/graphics/gimp-ufraw/patches/patch-ab deleted file mode 100644 index 7f45a88a12c..00000000000 --- a/graphics/gimp-ufraw/patches/patch-ab +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2005/04/13 16:56:27 rillig Exp $ - -Needed for ISO C90 compliance. - ---- ufraw_preview.c.orig Tue Feb 8 16:04:59 2005 -+++ ufraw_preview.c Tue Apr 12 10:14:48 2005 -@@ -288,7 +288,7 @@ void color_labels_set(colorLabels *l, fl - - for (c=0; c<3; c++) { - switch (l->format) { -- case pixel_format: snprintf(buf1, max_name, "%3.f", data[c]); break; -+ case pixel_format: snprintf(buf1, max_name, "%3.0f", data[c]); break; - case percent_format: - if (data[c]<10.0) - snprintf(buf1, max_name, "%2.1f%%", data[c]); -@@ -599,11 +599,11 @@ void reset_to_defaults(GtkWidget *widget - - void spot_wb(GtkWidget *widget, gpointer user_data) - { -- widget = widget; -- user_data = user_data; - int xi, yi, c; - float rgb[3]; - -+ widget = widget; -+ user_data = user_data; - if (freezeDialog) return; - if (!spotOn) { - ufraw_message(UFRAW_ERROR, "Select a spot on the preview image " diff --git a/graphics/gimp-ufraw/patches/patch-ac b/graphics/gimp-ufraw/patches/patch-ac deleted file mode 100644 index 445da46a18b..00000000000 --- a/graphics/gimp-ufraw/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2005/04/13 16:56:27 rillig Exp $ - -Needed for ISO C90 compliance. - ---- ufraw_ufraw.c.orig Tue Feb 8 16:04:59 2005 -+++ ufraw_ufraw.c Tue Apr 12 10:56:20 2005 -@@ -123,7 +123,7 @@ int ufraw_config(image_data *image, cfg_ - for (i=0; icurveCount; i++) - cfg->curve[i].black = cfg_default.curve[0].black; - } -- if (cfg->exposureLoad==load_auto) cfg->exposure = nan(""); -+ if (cfg->exposureLoad==load_auto) cfg->exposure = strtod("NAN", (char**) NULL); - - if (image==NULL) return UFRAW_SUCCESS; - diff --git a/graphics/gimp-ufraw/patches/patch-ad b/graphics/gimp-ufraw/patches/patch-ad deleted file mode 100644 index 07d97ef4ab6..00000000000 --- a/graphics/gimp-ufraw/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2005/04/25 16:52:11 wiz Exp $ - ---- dcraw.c.orig 2005-02-08 10:04:59.000000000 -0500 -+++ dcraw.c -@@ -181,7 +181,10 @@ int tone_curve_size = 0, tone_curve_offs - - */ - --#ifndef __GLIBC__ -+#include -+ -+#if !(defined(__GLIBC__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 300000000))) -+ - char *memmem (char *haystack, size_t haystacklen, - char *needle, size_t needlelen) - { -- cgit v1.2.3