[101696] trunk/dports/graphics/darktable
ryandesign at macports.org
ryandesign at macports.org
Thu Jan 17 03:53:59 PST 2013
Revision: 101696
https://trac.macports.org/changeset/101696
Author: ryandesign at macports.org
Date: 2013-01-17 03:53:59 -0800 (Thu, 17 Jan 2013)
Log Message:
-----------
darktable: update to 1.1.2 (maintainer timeout; #31374)
Modified Paths:
--------------
trunk/dports/graphics/darktable/Portfile
Added Paths:
-----------
trunk/dports/graphics/darktable/files/patch-build.sh.diff
Removed Paths:
-------------
trunk/dports/graphics/darktable/files/patch-Werror.diff
trunk/dports/graphics/darktable/files/patch-build-for-gcc46.diff
trunk/dports/graphics/darktable/files/patch-darktablerc.diff
trunk/dports/graphics/darktable/files/patch-src-common-exif.cc.diff
trunk/dports/graphics/darktable/files/patch-src-iop-lens.c.diff
Modified: trunk/dports/graphics/darktable/Portfile
===================================================================
--- trunk/dports/graphics/darktable/Portfile 2013-01-17 11:52:26 UTC (rev 101695)
+++ trunk/dports/graphics/darktable/Portfile 2013-01-17 11:53:59 UTC (rev 101696)
@@ -2,14 +2,15 @@
# $Id$
PortSystem 1.0
+PortGroup active_variants 1.1
name darktable
-version 0.7.1
-revision 5
+version 1.1.2
+set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics
platforms darwin
maintainers gmail.com:julians37
-license GPL-3
+license GPL-3+
description Virtual lighttable and darkroom for photographers
@@ -19,112 +20,104 @@
lighttable. It also enables you to develop raw images \
and enhance them.
-homepage http://darktable.sf.net/
-master_sites sourceforge
+homepage http://www.darktable.org/
+master_sites sourceforge:project/darktable/darktable/${branch}
-checksums sha1 c0cb70f89ec5662f0eb3b38e7f4019235e93d5e4 \
- rmd160 13ce9120dfe217e21795159a2f0eca34a9e495d6
+checksums rmd160 8c4594334f884866b789fedf87093f232c3fb4b4 \
+ sha256 225ebf1bd2ca4cf06aa609f2eda55cb0894ae69bdf4db25fd97b2503c28e1765
-depends_build port:intltool \
+depends_build port:cmake \
port:pkgconfig
+
depends_lib path:lib/pkgconfig/cairo.pc:cairo \
port:curl \
port:dbus-glib \
port:exiv2 \
+ port:gettext \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:gtk2 \
port:gtk-engines2 \
port:jpeg \
- port:lcms \
+ port:json-glib \
+ port:lcms2 \
port:lensfun \
port:libglade2 \
port:libgphoto2 \
port:libpng \
port:librsvg \
+ port:libxml2 \
port:openexr \
port:sqlite3 \
- port:tiff
+ port:tiff \
+ port:zlib
-patchfiles patch-src-common-exif.cc.diff patch-darktablerc.diff \
- patch-src-iop-lens.c.diff patch-Werror.diff
+patchfiles patch-build.sh.diff
-configure.args-append --disable-gconf --disable-gkeyring
+configure.cmd ./build.sh
+configure.pre_args --prefix ${prefix}
+configure.args --jobs ${build.jobs} \
+ --disable-flickr \
+ --disable-kwallet \
+ --disable-gnome-keyring \
+ --disable-openmp \
+ --disable-opencl \
+ --disable-unity \
+ --disable-tethering \
+ --disable-experimental \
+ --disable-geo
+configure.universal_args-delete --disable-dependency-tracking
+
if {[variant_isset no_x11]} {
- default_variants +quartz
+ default_variants +quartz -x11
}
if {![variant_isset quartz]} {
default_variants +x11
}
-pre-fetch {
+pre-configure {
if {![variant_isset quartz] && ![variant_isset x11]} {
- error "Either +x11 or +quartz is required"
+ return -code error "either +x11 or +quartz is required"
}
}
-pre-configure {
- if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
- set gtk_not_quartz [catch {exec grep -q GDK_WINDOWING_QUARTZ ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
- set gtk_not_x11 [catch {exec grep -q GDK_WINDOWING_X11 ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
- if {[variant_isset quartz] && ${gtk_not_quartz}} {
- error "+quartz variant selected, but gtk2+x11 is installed"
- } elseif {[variant_isset x11] && ${gtk_not_x11}} {
- error "+x11 variant selected, but gtk2+quartz is installed"
- }
- } else {
- error "Cannot find gdkconfig.h"
- }
-}
+build.dir ${worksrcpath}/build
-variant quartz requires no_x11 conflicts x11 gcc44 gcc45 {
+variant quartz conflicts x11 gcc44 gcc45 {
+ require_active_variants gtk2 quartz
}
-variant x11 conflicts quartz description {Enable rendering in X11} {
+variant x11 conflicts no_x11 quartz {
+ require_active_variants gtk2 x11
}
-variant no_x11 {
-}
+# no_x11 variant to be removed after January 2014
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
-variant gcc44 conflicts gcc45 gcc46 quartz description {Build with GCC 4.4} {
+variant gcc44 conflicts gcc45 gcc46 gcc47 quartz universal description {Build with GCC 4.4} {
depends_lib-append port:gcc44
configure.compiler macports-gcc-4.4
}
-variant gcc45 conflicts gcc44 gcc46 quartz description {Build with GCC 4.5} {
+variant gcc45 conflicts gcc44 gcc46 gcc47 quartz universal description {Build with GCC 4.5} {
depends_lib-append port:gcc45
configure.compiler macports-gcc-4.5
}
-variant gcc46 conflicts gcc44 gcc45 description {Build with GCC 4.6} {
+variant gcc46 conflicts gcc44 gcc45 gcc47 universal description {Build with GCC 4.6} {
depends_lib-append port:gcc46
-
- configure.cc ${prefix}/bin/gcc-mp-4.6
- configure.cxx ${prefix}/bin/g++-mp-4.6
- configure.cpp ${prefix}/bin/cpp-mp-4.6
-
- configure.cc_archflags
- configure.cxx_archflags
- configure.ld_archflags
-
- configure.universal_cflags
- configure.universal_cxxflags
- configure.universal_ldflags
- configure.universal_args
-
- patchfiles-append patch-build-for-gcc46.diff
+ configure.compiler macports-gcc-4.6
}
-variant gconf description {build with gconf} {
- configure.args-delete --disable-gconf
- configure.args-append --enable-gconf
- depends_lib-append port:gconf
+variant gcc47 conflicts gcc44 gcc45 gcc46 universal description {Build with GCC 4.7} {
+ depends_lib-append port:gcc47
+ configure.compiler macports-gcc-4.7
}
-variant gnome_keyring description {build with gnome-keyring} {
- configure.args-delete --disable-gkeyring
- configure.args-append --enable-gkeyring
+variant gnome_keyring description {Build with gnome-keyring} {
+ configure.args-delete --disable-gnome-keyring
+ configure.args-append --enable-gnome-keyring
depends_lib-append port:libgnome-keyring
}
Deleted: trunk/dports/graphics/darktable/files/patch-Werror.diff
===================================================================
--- trunk/dports/graphics/darktable/files/patch-Werror.diff 2013-01-17 11:52:26 UTC (rev 101695)
+++ trunk/dports/graphics/darktable/files/patch-Werror.diff 2013-01-17 11:53:59 UTC (rev 101696)
@@ -1,84 +0,0 @@
---- src/imageio/format/Makefile.in.orig 2010-12-07 23:18:55.000000000 +1100
-+++ src/imageio/format/Makefile.in 2012-05-09 14:35:49.000000000 +1000
-@@ -161,7 +161,7 @@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror \
-+CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. \
- -g -rdynamic
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
-@@ -171,7 +171,7 @@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@ $(AM_CXXFLAGS) $(OPENEXR_CFLAGS) -I$(srcdir) \
-- -I$(srcdir)/../.. -Werror -g -rdynamic
-+ -I$(srcdir)/../.. -g -rdynamic
- CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
- DBUSGLIB_CFLAGS = @DBUSGLIB_CFLAGS@
---- src/imageio/storage/Makefile.in.orig 2010-12-07 23:18:55.000000000 +1100
-+++ src/imageio/storage/Makefile.in 2012-05-09 14:36:04.000000000 +1000
-@@ -133,7 +133,7 @@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror \
-+CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. \
- -g -rdynamic
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
---- src/iop/Makefile.in.orig 2010-12-07 23:18:55.000000000 +1100
-+++ src/iop/Makefile.in 2012-05-09 14:36:18.000000000 +1000
-@@ -286,7 +286,7 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. \
-- -I$(srcdir)/dtgtk -Werror -g $(RSVG_CFLAGS)
-+ -I$(srcdir)/dtgtk -g $(RSVG_CFLAGS)
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CURL_CFLAGS = @CURL_CFLAGS@
-@@ -295,7 +295,7 @@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@ $(AM_CPPFLAGS) -I$(srcdir) -I$(srcdir)/.. \
-- -I$(srcdir)/dtgtk -Werror -g
-+ -I$(srcdir)/dtgtk -g
- CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
- DBUSGLIB_CFLAGS = @DBUSGLIB_CFLAGS@
---- src/libs/Makefile.in.orig 2010-12-07 23:18:55.000000000 +1100
-+++ src/libs/Makefile.in 2012-05-09 14:36:30.000000000 +1000
-@@ -159,7 +159,7 @@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g \
-+CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -g \
- -rdynamic
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
---- src/Makefile.in.orig 2010-12-07 23:18:55.000000000 +1100
-+++ src/Makefile.in 2012-05-09 14:36:46.000000000 +1000
-@@ -404,7 +404,7 @@
- $(SQLITE_CFLAGS) $(OPENMP_CFLAGS) $(GCONF_CFLAGS) \
- -fno-strict-aliasing -Wall -std=c99 -I$(srcdir)/LibRaw -fPIC \
- -DDATADIR=\"$(datadir)/darktable\" -DLIBDIR=\""$(libdir)"\" \
-- -Werror -rdynamic -Wno-deprecated-declarations
-+ -rdynamic -Wno-deprecated-declarations
- AM_CXXFLAGS = $(GNOME_KEYRING_CFLAGS) $(GPHOTO2_CFLAGS) $(GEGL_CFLAGS) $(DBUSGLIB_CFLAGS) $(EXIV2_CFLAGS) $(CAIRO_CFLAGS) $(GLADE_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(SQLITE_CFLAGS) $(OPENMP_CFLAGS) $(GCONF_CFLAGS) -fno-strict-aliasing -Wall -I$(srcdir)/LibRaw -fPIC -DDATADIR=\"$(datadir)/darktable\" -DLIBDIR=\""$(libdir)"\"
- AM_CPPFLAGS = $(OPENEXR_CFLAGS)
- libdarktable_LTLIBRARIES = libdarktable.la
---- src/views/Makefile.in.orig 2010-12-07 23:18:55.000000000 +1100
-+++ src/views/Makefile.in 2012-05-09 14:36:58.000000000 +1000
-@@ -138,7 +138,7 @@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g \
-+CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -g \
- -rdynamic
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
Deleted: trunk/dports/graphics/darktable/files/patch-build-for-gcc46.diff
===================================================================
--- trunk/dports/graphics/darktable/files/patch-build-for-gcc46.diff 2013-01-17 11:52:26 UTC (rev 101695)
+++ trunk/dports/graphics/darktable/files/patch-build-for-gcc46.diff 2013-01-17 11:53:59 UTC (rev 101696)
@@ -1,174 +0,0 @@
-diff -ru ../darktable-0.7.1-orig/configure ./configure
---- ../darktable-0.7.1-orig/configure 2010-12-08 01:18:53.000000000 +1300
-+++ ./configure 2011-01-20 19:34:48.000000000 +1300
-@@ -12038,7 +12038,7 @@
- ;;
-
- bsdi[45]*)
-- export_dynamic_flag_spec=-rdynamic
-+ export_dynamic_flag_spec=
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
-diff -ru ../darktable-0.7.1-orig/src/Makefile.am ./src/Makefile.am
---- ../darktable-0.7.1-orig/src/Makefile.am 2010-12-08 00:49:56.000000000 +1300
-+++ ./src/Makefile.am 2011-01-21 09:50:11.000000000 +1300
-@@ -1,6 +1,6 @@
- SUBDIRS=LibRaw iop views libs imageio # gegl-operations
- include shared.am
--AM_CFLAGS+=-Werror -rdynamic -Wno-deprecated-declarations
-+AM_CFLAGS+=-Werror -Wno-deprecated-declarations -Wno-error=unused-but-set-variable
- AM_CPPFLAGS=$(OPENEXR_CFLAGS)
- libdarktable_LTLIBRARIES=libdarktable.la
- libdarktabledir=$(libdir)/darktable
-diff -ru ../darktable-0.7.1-orig/src/Makefile.in ./src/Makefile.in
---- ../darktable-0.7.1-orig/src/Makefile.in 2010-12-08 01:18:55.000000000 +1300
-+++ ./src/Makefile.in 2011-01-21 09:50:17.000000000 +1300
-@@ -404,7 +404,7 @@
- $(SQLITE_CFLAGS) $(OPENMP_CFLAGS) $(GCONF_CFLAGS) \
- -fno-strict-aliasing -Wall -std=c99 -I$(srcdir)/LibRaw -fPIC \
- -DDATADIR=\"$(datadir)/darktable\" -DLIBDIR=\""$(libdir)"\" \
-- -rdynamic -Wno-deprecated-declarations
-+ -Wno-deprecated-declarations -Wno-error=unused-but-set-variable
- AM_CXXFLAGS = $(GNOME_KEYRING_CFLAGS) $(GPHOTO2_CFLAGS) $(GEGL_CFLAGS) $(DBUSGLIB_CFLAGS) $(EXIV2_CFLAGS) $(CAIRO_CFLAGS) $(GLADE_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(SQLITE_CFLAGS) $(OPENMP_CFLAGS) $(GCONF_CFLAGS) -fno-strict-aliasing -Wall -I$(srcdir)/LibRaw -fPIC -DDATADIR=\"$(datadir)/darktable\" -DLIBDIR=\""$(libdir)"\"
- AM_CPPFLAGS = $(OPENEXR_CFLAGS)
- libdarktable_LTLIBRARIES = libdarktable.la
-diff -ru ../darktable-0.7.1-orig/src/imageio/format/Makefile.am ./src/imageio/format/Makefile.am
---- ../darktable-0.7.1-orig/src/imageio/format/Makefile.am 2010-12-08 00:49:56.000000000 +1300
-+++ ./src/imageio/format/Makefile.am 2011-01-21 09:49:29.000000000 +1300
-@@ -1,7 +1,7 @@
- include $(srcdir)/../../shared.am
- LDFLAGS= -module -avoid-version
--CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror -g -rdynamic
--CXXFLAGS+=$(AM_CXXFLAGS) $(OPENEXR_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror -g -rdynamic
-+CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror -Wno-error=unused-but-set-variable -g
-+CXXFLAGS+=$(AM_CXXFLAGS) $(OPENEXR_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror -Wno-error=unused-but-set-variable -g
- LTADD=$(OPENMP_CFLAGS) $(GEGL_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(CAIRO_LIBS) $(GLADE_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(SQLITE_LIBS) -fPIC
- libjpeg_la_SOURCES=jpeg.c
- libpng_la_SOURCES=png.c
-diff -ru ../darktable-0.7.1-orig/src/imageio/format/Makefile.in ./src/imageio/format/Makefile.in
---- ../darktable-0.7.1-orig/src/imageio/format/Makefile.in 2010-12-08 01:18:55.000000000 +1300
-+++ ./src/imageio/format/Makefile.in 2011-01-21 09:49:22.000000000 +1300
-@@ -162,7 +162,7 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. \
-- -g -rdynamic
-+ -Wno-error=unused-but-set-variable -g
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CURL_CFLAGS = @CURL_CFLAGS@
-@@ -171,7 +171,7 @@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@ $(AM_CXXFLAGS) $(OPENEXR_CFLAGS) -I$(srcdir) \
-- -I$(srcdir)/../.. -g -rdynamic
-+ -I$(srcdir)/../.. -Wno-error=unused-but-set-variable -g
- CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
- DBUSGLIB_CFLAGS = @DBUSGLIB_CFLAGS@
-diff -ru ../darktable-0.7.1-orig/src/imageio/storage/Makefile.am ./src/imageio/storage/Makefile.am
---- ../darktable-0.7.1-orig/src/imageio/storage/Makefile.am 2010-12-08 00:49:56.000000000 +1300
-+++ ./src/imageio/storage/Makefile.am 2011-01-21 09:49:12.000000000 +1300
-@@ -1,6 +1,6 @@
- include $(srcdir)/../../shared.am
- LDFLAGS= -module -avoid-version
--CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror -g -rdynamic
-+CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. -Werror -Wno-error=unused-but-set-variable -g
- LDADD=$(OPENMP_CFLAGS) $(GEGL_LIBS) $(CURL_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(CAIRO_LIBS) $(GLADE_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(SQLITE_LIBS) -fPIC
- libdisk_la_SOURCES=disk.c
- libpicasa_la_SOURCES=picasa.c
-diff -ru ../darktable-0.7.1-orig/src/imageio/storage/Makefile.in ./src/imageio/storage/Makefile.in
---- ../darktable-0.7.1-orig/src/imageio/storage/Makefile.in 2010-12-08 01:18:55.000000000 +1300
-+++ ./src/imageio/storage/Makefile.in 2011-01-21 09:49:06.000000000 +1300
-@@ -134,7 +134,7 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/../.. \
-- -g -rdynamic
-+ -Wno-error=unused-but-set-variable -g
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CURL_CFLAGS = @CURL_CFLAGS@
-diff -ru ../darktable-0.7.1-orig/src/iop/Makefile.am ./src/iop/Makefile.am
---- ../darktable-0.7.1-orig/src/iop/Makefile.am 2010-12-08 00:49:56.000000000 +1300
-+++ ./src/iop/Makefile.am 2011-01-21 09:49:49.000000000 +1300
-@@ -1,7 +1,7 @@
- include $(srcdir)/../shared.am
- LDFLAGS= -module -avoid-version
--CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/dtgtk -Werror -g $(RSVG_CFLAGS)
--CXXFLAGS+=$(AM_CPPFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/dtgtk -Werror -g
-+CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/dtgtk -Werror -g -Wno-error=unused-but-set-variable $(RSVG_CFLAGS)
-+CXXFLAGS+=$(AM_CPPFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/dtgtk -Werror -g -Wno-error=unused-but-set-variable
- LTADD=$(GEGL_LIBS) $(CAIRO_LIBS) $(GLADE_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(SQLITE_LIBS) -fPIC
- libtonecurve_la_SOURCES=tonecurve.c
- libgamma_la_SOURCES=gamma.c
-diff -ru ../darktable-0.7.1-orig/src/iop/Makefile.in ./src/iop/Makefile.in
---- ../darktable-0.7.1-orig/src/iop/Makefile.in 2010-12-08 01:18:55.000000000 +1300
-+++ ./src/iop/Makefile.in 2011-01-21 09:49:43.000000000 +1300
-@@ -286,7 +286,7 @@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. \
-- -I$(srcdir)/dtgtk -g $(RSVG_CFLAGS)
-+ -I$(srcdir)/dtgtk -g -Wno-error=unused-but-set-variable $(RSVG_CFLAGS)
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CURL_CFLAGS = @CURL_CFLAGS@
-@@ -295,7 +295,7 @@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@ $(AM_CPPFLAGS) -I$(srcdir) -I$(srcdir)/.. \
-- -I$(srcdir)/dtgtk -g
-+ -I$(srcdir)/dtgtk -Wno-error=unused-but-set-variable -g
- CYGPATH_W = @CYGPATH_W@
- DATADIRNAME = @DATADIRNAME@
- DBUSGLIB_CFLAGS = @DBUSGLIB_CFLAGS@
-diff -ru ../darktable-0.7.1-orig/src/libs/Makefile.am ./src/libs/Makefile.am
---- ../darktable-0.7.1-orig/src/libs/Makefile.am 2010-12-08 00:49:56.000000000 +1300
-+++ ./src/libs/Makefile.am 2011-01-21 09:50:05.000000000 +1300
-@@ -1,6 +1,6 @@
- include $(srcdir)/../shared.am
- LDFLAGS= -module -avoid-version
--CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g -rdynamic
-+CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g -Wno-error=unused-but-set-variable
- LTADD=$(OPENMP_CFLAGS) $(GEGL_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(CAIRO_LIBS) $(GLADE_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(SQLITE_LIBS) -fPIC
- libexport_la_SOURCES=export.c
- libcopy_history_la_SOURCES=copy_history.c
-diff -ru ../darktable-0.7.1-orig/src/libs/Makefile.in ./src/libs/Makefile.in
---- ../darktable-0.7.1-orig/src/libs/Makefile.in 2010-12-08 01:18:55.000000000 +1300
-+++ ./src/libs/Makefile.in 2011-01-21 09:49:58.000000000 +1300
-@@ -159,8 +159,7 @@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -g \
-- -rdynamic
-+CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -g -Wno-error=unused-but-set-variable
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CURL_CFLAGS = @CURL_CFLAGS@
-diff -ru ../darktable-0.7.1-orig/src/views/Makefile.am ./src/views/Makefile.am
---- ../darktable-0.7.1-orig/src/views/Makefile.am 2010-12-08 00:49:56.000000000 +1300
-+++ ./src/views/Makefile.am 2011-01-21 09:49:00.000000000 +1300
-@@ -1,6 +1,6 @@
- include $(srcdir)/../shared.am
- LDFLAGS= -module -avoid-version
--CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g -rdynamic
-+CFLAGS+=$(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -Werror -g -Wno-error=unused-but-set-variable
- LTADD=$(OPENMP_CFLAGS) $(GEGL_LIBS) $(JPEG_LIBS) $(PNG_LIBS) $(LCMS_LIBS) $(EXIV2_LIBS) $(CAIRO_LIBS) $(GLADE_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(SQLITE_LIBS) -fPIC
- libdarkroom_la_SOURCES=darkroom.c
- liblighttable_la_SOURCES=lighttable.c
-diff -ru ../darktable-0.7.1-orig/src/views/Makefile.in ./src/views/Makefile.in
---- ../darktable-0.7.1-orig/src/views/Makefile.in 2010-12-08 01:18:55.000000000 +1300
-+++ ./src/views/Makefile.in 2011-01-21 09:48:45.000000000 +1300
-@@ -138,8 +138,7 @@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -g \
-- -rdynamic
-+CFLAGS = @CFLAGS@ $(AM_CFLAGS) -I$(srcdir) -I$(srcdir)/.. -g -Wno-error=unused-but-set-variable
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CURL_CFLAGS = @CURL_CFLAGS@
Added: trunk/dports/graphics/darktable/files/patch-build.sh.diff
===================================================================
--- trunk/dports/graphics/darktable/files/patch-build.sh.diff (rev 0)
+++ trunk/dports/graphics/darktable/files/patch-build.sh.diff 2013-01-17 11:53:59 UTC (rev 101696)
@@ -0,0 +1,10 @@
+--- build.sh.orig 2013-01-11 17:40:01.000000000 -0600
++++ build.sh 2013-01-17 04:08:50.000000000 -0600
+@@ -238,6 +238,7 @@
+ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+ ${CMAKE_MORE_OPTIONS} \
+ "$DT_SRC_DIR" \
++&& exit
+ && $MAKE -j $MAKE_TASKS
+
+ if [ $? = 0 ]; then
Deleted: trunk/dports/graphics/darktable/files/patch-darktablerc.diff
===================================================================
--- trunk/dports/graphics/darktable/files/patch-darktablerc.diff 2013-01-17 11:52:26 UTC (rev 101695)
+++ trunk/dports/graphics/darktable/files/patch-darktablerc.diff 2013-01-17 11:53:59 UTC (rev 101696)
@@ -1,35 +0,0 @@
-diff -ru ../orig/darktable-0.7.1/Makefile.am ./Makefile.am
---- ../orig/darktable-0.7.1/Makefile.am 2010-12-08 00:49:56.000000000 +1300
-+++ ./Makefile.am 2011-01-18 12:35:18.000000000 +1300
-@@ -33,4 +33,8 @@
- else
- EXTRA_DIST+=darktablerc
- dtdataroot_DATA+=darktablerc
-+
-+darktablerc: tools/create_darktablerc.sh
-+ tools/create_darktablerc.sh
-+
- endif
-diff -ru ../orig/darktable-0.7.1/Makefile.in ./Makefile.in
---- ../orig/darktable-0.7.1/Makefile.in 2010-12-08 01:18:55.000000000 +1300
-+++ ./Makefile.in 2011-01-18 12:36:11.000000000 +1300
-@@ -999,6 +999,9 @@
- @GCONF_SCHEMAS_INSTALL_TRUE@@HAVE_GCONF_TRUE@ fi
- @GCONF_SCHEMAS_INSTALL_FALSE@@HAVE_GCONF_TRUE at install-data-local:
-
-+ at HAVE_GCONF_FALSE@darktablerc: tools/create_darktablerc.sh
-+ at HAVE_GCONF_FALSE@ tools/create_darktablerc.sh
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -ru ../orig/darktable-0.7.1/tools/create_darktablerc.sh ./tools/create_darktablerc.sh
---- ../orig/darktable-0.7.1/tools/create_darktablerc.sh 2010-10-21 19:59:59.000000000 +1300
-+++ ./tools/create_darktablerc.sh 2011-01-18 11:52:06.000000000 +1300
-@@ -2,5 +2,5 @@
-
- cat darktable.schemas.in | grep '<key>' | sed -e 's/<key>//g' -e 's/<\/key>//g' -e 's/\/schemas\/apps\/darktable\///g' | nl -s: | sed -e 's/^[ \t]*//;s/[ \t]*$//' > dreggn1
- cat darktable.schemas.in | grep '<default>' | sed -e 's/<default>//g' -e 's/<\/default>//g' | nl -s: | sed -e 's/^[ \t]*//;s/[ \t]*$//' > dreggn2
--join -j 1 -o 1.2 2.2 dreggn1 dreggn2 | sed -e 's/ /=/g' > darktablerc
-+join -1 1 -2 1 -o "1.2 2.2" dreggn1 dreggn2 | sed -e 's/ /=/g' > darktablerc
- rm -f dreggn{1,2}
Deleted: trunk/dports/graphics/darktable/files/patch-src-common-exif.cc.diff
===================================================================
--- trunk/dports/graphics/darktable/files/patch-src-common-exif.cc.diff 2013-01-17 11:52:26 UTC (rev 101695)
+++ trunk/dports/graphics/darktable/files/patch-src-common-exif.cc.diff 2013-01-17 11:53:59 UTC (rev 101696)
@@ -1,10 +0,0 @@
---- src/common/exif.cc.orig 2010-12-08 00:49:56.000000000 +1300
-+++ src/common/exif.cc 2011-01-16 13:53:58.000000000 +1300
-@@ -33,7 +33,6 @@
- #include <exiv2/error.hpp>
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
--#include <exiv2/canonmn.hpp>
- #include <sqlite3.h>
- #include <iostream>
- #include <fstream>
Deleted: trunk/dports/graphics/darktable/files/patch-src-iop-lens.c.diff
===================================================================
--- trunk/dports/graphics/darktable/files/patch-src-iop-lens.c.diff 2013-01-17 11:52:26 UTC (rev 101695)
+++ trunk/dports/graphics/darktable/files/patch-src-iop-lens.c.diff 2013-01-17 11:53:59 UTC (rev 101696)
@@ -1,12 +0,0 @@
-diff -ru ../orig/darktable-0.7.1/src/iop/lens.c ./src/iop/lens.c
---- ../orig/darktable-0.7.1/src/iop/lens.c 2010-12-08 00:49:56.000000000 +1300
-+++ ./src/iop/lens.c 2011-01-18 15:06:57.000000000 +1300
-@@ -373,7 +374,7 @@
- char *c = path + strlen(path);
- for(;c>path && *c != '/';c--);
- sprintf(c, "/lensfun");
-- dt_iop_lensfun_db->HomeDataDir = path;
-+ dt_iop_lensfun_db->HomeDataDir = g_build_filename(path, NULL);
- if(lf_db_load(dt_iop_lensfun_db) != LF_NO_ERROR)
- {
- fprintf(stderr, "[iop_lens]: could not load lensfun database in `%s'!\n", path);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130117/19fe22e2/attachment-0001.html>
More information about the macports-changes
mailing list