cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update UFRaw to 0.17, rolling in the lensfun flavour.

Browse Source
This commit is contained in:
sthen 2010-09-16 10:18:38 +00:00
parent 2643e08e66
commit ae131473a1
8 changed files with 40 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
graphics/ufraw/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.22 2010/04/03 00:32:56 sthen Exp $
# $OpenBSD: Makefile,v 1.23 2010/09/16 10:18:38 sthen Exp $
COMMENT= read and manipulate raw images from digital cameras
DISTNAME= ufraw-0.16
PKGNAME= ${DISTNAME}p1
DISTNAME= ufraw-0.17
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ufraw/}
@ -22,14 +21,18 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += glitz gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
WANTLIB += jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
WANTLIB += png pthread pthread-stubs stdc++ tiff xcb z
WANTLIB += png pthread pthread-stubs stdc++ tiff xcb xcb-render
WANTLIB += xcb-render-util z lensfun lcms bz2 exiv2 cfitsio gtkimageview
WANTLIB += gimp-2.0 gimpbase-2.0 gimpcolor-2.0 gimpconfig-2.0
WANTLIB += gimpmath-2.0 gimpui-2.0 gimpwidgets-2.0 gimpmodule-2.0
LIB_DEPENDS= gimp-2.0,gimpbase-2.0,gimpcolor-2.0,gimpconfig-2.0,gimpmath-2.0,gimpui-2.0,gimpwidgets-2.0,gimpmodule-2.0:gimp->=2,<3:graphics/gimp/stable \
lcms.>=1.15::graphics/lcms \
bz2.>=10::archivers/bzip2 \
exiv2::graphics/exiv2 \
cfitsio::math/cfitsio \
gtkimageview::graphics/gtkimageview
LIB_DEPENDS= :gimp->=2,<3:graphics/gimp/stable \
::graphics/lcms \
::archivers/bzip2 \
::graphics/exiv2 \
::math/cfitsio \
::graphics/gtkimageview \
::graphics/lensfun
MODULES= devel/gettext
@ -39,14 +42,7 @@ USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -pthread"
CONFIGURE_ARGS= --enable-extras
FLAVORS= lensfun
FLAVOR?=
.if ${FLAVOR:L:Mlensfun}
CONFIGURE_ARGS+=--with-lensfun
LIB_DEPENDS+= lensfun::graphics/lensfun
.endif
CONFIGURE_ARGS= --enable-extras \
--enable-silent-rules=no
.include <bsd.port.mk>

10
graphics/ufraw/distinfo
View File

@ -1,5 +1,5 @@
MD5 (ufraw-0.16.tar.gz) = YeEA5C8X46f8+uZFBu69FA==
RMD160 (ufraw-0.16.tar.gz) = +sZ6TYjABvcBsMznzCKH1duQvXI=
SHA1 (ufraw-0.16.tar.gz) = /5HsYZ0UO7tGmLEAPVPFB6ygEOU=
SHA256 (ufraw-0.16.tar.gz) = NvH+atsBKzT+A1EiHhoKLC4I7wXo6wXr6rFsz0/z3xk=
SIZE (ufraw-0.16.tar.gz) = 1075577
MD5 (ufraw-0.17.tar.gz) = XiwrStrqH20D6sZuEXR/xg==
RMD160 (ufraw-0.17.tar.gz) = eF1G5pNvF2Ig2/d/ht03PvAlCnk=
SHA1 (ufraw-0.17.tar.gz) = B2KyOM3NcIlIta6sVS9/Kx7bGEY=
SHA256 (ufraw-0.17.tar.gz) = 9loy2bwe2/U5nm0+GGF99DgPE9jQLTL6Kq7kpAS+tqI=
SIZE (ufraw-0.17.tar.gz) = 1158114

8
graphics/ufraw/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.3 2009/10/21 22:44:52 sthen Exp $
--- Makefile.in.orig Fri Oct 16 02:37:53 2009
+++ Makefile.in Wed Oct 21 23:31:27 2009
@@ -116,7 +116,7 @@ am__nikon_curve_SOURCES_DIST = nikon_curve.c
$OpenBSD: patch-Makefile_in,v 1.4 2010/09/16 10:18:38 sthen Exp $
--- Makefile.in.orig Thu Apr 1 00:19:33 2010
+++ Makefile.in Wed Apr 7 03:42:17 2010
@@ -127,7 +127,7 @@ am__nikon_curve_SOURCES_DIST = nikon_curve.c
nikon_curve_OBJECTS = $(am_nikon_curve_OBJECTS)
@MAKE_EXTRAS_TRUE@nikon_curve_DEPENDENCIES = $(am__DEPENDENCIES_1)
nikon_curve_LINK = $(CCLD) $(nikon_curve_CFLAGS) $(CFLAGS) \

18
graphics/ufraw/patches/patch-nikon_curve_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-nikon_curve_c,v 1.6 2009/10/21 22:44:52 sthen Exp $
--- nikon_curve.c.orig Thu Jul 9 02:23:49 2009
+++ nikon_curve.c Wed Oct 21 23:31:01 2009
@@ -77,8 +77,8 @@ static const unsigned char *FileTypeHeaders[NUM_FILE_T
$OpenBSD: patch-nikon_curve_c,v 1.7 2010/09/16 10:18:38 sthen Exp $
--- nikon_curve.c.orig Tue Feb 23 17:53:25 2010
+++ nikon_curve.c Wed Apr 7 03:42:17 2010
@@ -353,8 +353,8 @@ static const unsigned char *FileTypeHeaders[NUM_FILE_T
#ifdef _STAND_ALONE_
//filenames
@ -12,7 +12,7 @@ $OpenBSD: patch-nikon_curve_c,v 1.6 2009/10/21 22:44:52 sthen Exp $
unsigned int standalone_samplingRes = 65536;
unsigned int standalone_outputRes = 256;
@@ -119,8 +119,7 @@ int ProcessArgs(int num_args, char *args[])
@@ -395,8 +395,7 @@ static int ProcessArgs(int num_args, char *args[])
else if (strcmp(args[i],"-o") == 0 || strcmp(args[i],"-O") == 0)
{
i++;
@ -22,7 +22,7 @@ $OpenBSD: patch-nikon_curve_c,v 1.6 2009/10/21 22:44:52 sthen Exp $
}
else if (strcmp(args[i],"-sr") == 0)
{
@@ -148,24 +147,21 @@ int ProcessArgs(int num_args, char *args[])
@@ -424,24 +423,21 @@ static int ProcessArgs(int num_args, char *args[])
{
i++;
program_mode = NEF_MODE;
@ -51,7 +51,7 @@ $OpenBSD: patch-nikon_curve_c,v 1.6 2009/10/21 22:44:52 sthen Exp $
}
return NC_SUCCESS;
@@ -1742,7 +1738,7 @@ int ConvertNikonCurveData(char *inFileName, char *outF
@@ -1998,7 +1994,7 @@ static int ConvertNikonCurveData(char *inFileName, cha
{
//Load the curve data from the ncv/ntc file
NikonData data;
@ -60,7 +60,7 @@ $OpenBSD: patch-nikon_curve_c,v 1.6 2009/10/21 22:44:52 sthen Exp $
if ( samplingRes <= 1 || outputRes <= 1 || samplingRes > MAX_RESOLUTION
|| outputRes > MAX_RESOLUTION )
@@ -1772,8 +1768,7 @@ int ConvertNikonCurveData(char *inFileName, char *outF
@@ -2028,8 +2024,7 @@ static int ConvertNikonCurveData(char *inFileName, cha
}
//rename output files
@ -70,7 +70,7 @@ $OpenBSD: patch-nikon_curve_c,v 1.6 2009/10/21 22:44:52 sthen Exp $
//if the name has an extension, attempt to remove it
if (tmpstr[strlen(tmpstr)-4] == '.')
{
@@ -1783,19 +1778,19 @@ int ConvertNikonCurveData(char *inFileName, char *outF
@@ -2039,19 +2034,19 @@ static int ConvertNikonCurveData(char *inFileName, cha
switch(i)
{
case TONE_CURVE:

16
graphics/ufraw/patches/patch-ufraw-batch_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-ufraw-batch_c,v 1.4 2009/06/21 14:01:28 sthen Exp $
--- ufraw-batch.c.orig Tue Jul 1 19:36:20 2008
+++ ufraw-batch.c Thu Jun 18 02:48:27 2009
@@ -63,9 +63,9 @@ int main (int argc, char **argv)
if (strlen(cmd.inputFilename)>0) {
status = conf_load(&conf, cmd.inputFilename);
if (status==UFRAW_SUCCESS) {
- strcpy(conf.inputFilename, "");
- strcpy(conf.outputFilename, "");
- strcpy(conf.outputPath, "");
+ strlcpy(conf.inputFilename, "",sizeof(conf.inputFilename));
+ strlcpy(conf.outputFilename, "",sizeof(conf.outputFilename));
+ strlcpy(conf.outputPath, "",sizeof(conf.outputPath));
} else {
ufraw_message(UFRAW_REPORT, NULL);
conf.version = 0;

16
graphics/ufraw/patches/patch-ufraw_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-ufraw_c,v 1.6 2009/10/21 22:44:52 sthen Exp $
--- ufraw.c.orig Fri Aug 14 03:34:46 2009
+++ ufraw.c Wed Oct 21 23:31:01 2009
@@ -90,9 +90,9 @@ int main (int argc, char **argv)
if (strlen(cmd.inputFilename)>0) {
status = conf_load(&conf, cmd.inputFilename);
if (status==UFRAW_SUCCESS) {
- strcpy(conf.inputFilename, "");
- strcpy(conf.outputFilename, "");
- strcpy(conf.outputPath, "");
+ strlcpy(conf.inputFilename, "", sizeof(conf.inputFilename));
+ strlcpy(conf.outputFilename, "", sizeof(conf.outputFilename));
+ strlcpy(conf.outputPath, "", sizeof(conf.outputPath));
} else {
ufraw_message(UFRAW_REPORT, NULL);
conf.version = 0;

10
graphics/ufraw/patches/patch-ufraw_developer_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ufraw_developer_c,v 1.6 2009/10/21 22:44:52 sthen Exp $
--- ufraw_developer.c.orig Tue Oct 6 06:13:00 2009
+++ ufraw_developer.c Wed Oct 21 23:31:01 2009
@@ -50,7 +50,7 @@ developer_data *developer_init()
$OpenBSD: patch-ufraw_developer_c,v 1.7 2010/09/16 10:18:38 sthen Exp $
--- ufraw_developer.c.orig Thu Mar 4 04:57:48 2010
+++ ufraw_developer.c Wed Apr 7 03:42:17 2010
@@ -41,7 +41,7 @@ developer_data *developer_init()
#endif
for (i=0; i<profile_types; i++) {
d->profile[i] = NULL;
@ -10,7 +10,7 @@ $OpenBSD: patch-ufraw_developer_c,v 1.6 2009/10/21 22:44:52 sthen Exp $
}
memset(&d->baseCurveData, 0, sizeof(d->baseCurveData));
d->baseCurveData.m_gamma = -1.0;
@@ -125,7 +125,7 @@ void developer_profile(developer_data *d, int type, pr
@@ -119,7 +119,7 @@ void developer_profile(developer_data *d, int type, pr
g_strlcpy(p->productName, cmsTakeProductName(d->profile[type]),
max_name);
else

3
graphics/ufraw/pkg/PLIST
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.6 2009/10/21 22:44:52 sthen Exp $
@comment $OpenBSD: PLIST,v 1.7 2010/09/16 10:18:38 sthen Exp $
@pkgpath graphics/ufraw,lensfun
@comment bin/dcraw
@bin bin/nikon-curve
@bin bin/ufraw