update to Darktable 2.0.0, this is a major update and moves to Gtk+3.

Too many improvements to mention here; for more information, see
http://www.darktable.org/2015/12/darktable-2-0-released/

Note: when updating from 1.6.x series, edits will be preserved, but it
will not be possible to downgrade from 2.0 to 1.6.x any more.
This commit is contained in:
sthen 2015-12-24 14:20:20 +00:00
parent 411fba42e3
commit d7f2f44cca
6 changed files with 36 additions and 72 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.55 2015/10/21 11:06:35 sthen Exp $
# $OpenBSD: Makefile,v 1.56 2015/12/24 14:20:20 sthen Exp $
ONLY_FOR_ARCHS= i386 amd64
COMMENT= virtual lighttable and darkroom for photographers
V= 1.6.9
V= 2.0.0
DISTNAME= darktable-$V
PORTROACH= limitw:1,even
EXTRACT_SUFX= .tar.xz
@ -21,14 +21,13 @@ MAINTAINER= Stuart Henderson <sthen@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += GL GLU GraphicsMagick ICE Iex IlmImf IlmThread Imath
WANTLIB += SDL SM X11 Xext Xrandr atk-1.0 c cairo colord colordprivate
WANTLIB += curl exiv2 flickcurl gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gphoto2 gphoto2_port
WANTLIB += gthread-2.0 gtk-x11-2.0 jpeg json-glib-1.0 lcms2 lua5.2
WANTLIB += m openjpeg pango-1.0 pangocairo-1.0 png pthread rsvg-2
WANTLIB += secret-1 soup-2.4 sqlite3 tiff webp xml2 z
WANTLIB += lensfun # dlopen'd. this is "Extra" in check-lib-depends; that's ok,
WANTLIB += SDL SM X11 Xext Xrandr atk-1.0 c cairo cairo-gobject
WANTLIB += colord colord-gtk colordprivate cups curl exiv2 flickcurl
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gphoto2 gphoto2_port gthread-2.0 gtk-3 jpeg json-glib-1.0
WANTLIB += lcms2 lensfun lua5.2 m openjpeg osmgpsmap-1.0 pango-1.0
WANTLIB += pangocairo-1.0 png pthread pugixml rsvg-2 secret-1
WANTLIB += soup-2.4 sqlite3 tiff webp xml2 z
MASTER_SITES= https://github.com/darktable-org/darktable/releases/download/release-$V/
@ -43,13 +42,13 @@ MODGCC4_LANGS= c c++
BUILD_DEPENDS= sysutils/coreutils
RUN_DEPENDS= devel/desktop-file-utils \
x11/gtk-engines2 \
x11/gtk+3,-guic
LIB_DEPENDS= devel/json-glib \
devel/libsoup \
devel/sdl \
geo/osm-gps-map \
graphics/GraphicsMagick \
graphics/colord \
graphics/colord-gtk \
graphics/exiv2>=0.22 \
graphics/lcms2 \
graphics/libgphoto2>=2.5.0 \
@ -58,9 +57,10 @@ LIB_DEPENDS= devel/json-glib \
graphics/openjpeg \
net/curl \
net/flickcurl \
textproc/pugixml \
x11/gnome/librsvg \
x11/gnome/libsecret \
x11/gtk+2
x11/gtk+3
SEPARATE_BUILD= Yes
@ -80,10 +80,6 @@ CFLAGS += -march=i686 -fomit-frame-pointer
CFLAGS+= -msse3
CXXFLAGS= ${CFLAGS}
post-patch:
@sed -i 's,/usr/X11R6,${X11BASE},' \
${WRKSRC}/src/external/colord-gtk/CMakeLists.txt
post-install:
cd ${PREFIX}/lib && ln -s darktable/libdarktable.so

View File

@ -1,2 +1,2 @@
SHA256 (darktable-1.6.9.tar.xz) = D3IenSmKlAf2wDJdnJW53Df6YPO2ovLjtWdf+XxCMXM=
SIZE (darktable-1.6.9.tar.xz) = 3124940
SHA256 (darktable-2.0.0.tar.xz) = 1PL1Jbu7E1W8NHDnTMFY151+I285JZKPZ6iEYfHffLE=
SIZE (darktable-2.0.0.tar.xz) = 2888596

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-data_CMakeLists_txt,v 1.3 2015/10/05 08:48:51 dcoppa Exp $
Fix conflicting target names
--- data/CMakeLists.txt.orig Mon Oct 5 10:25:29 2015
+++ data/CMakeLists.txt Mon Oct 5 10:26:55 2015
@@ -53,7 +53,7 @@ add_custom_command(
MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/darktable.desktop.in
DEPENDS ${PO_FILES}
)
-add_custom_target(darktable.desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop)
+add_custom_target(darktable_desktop_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop DESTINATION ./share/applications)
install(FILES darktable.appdata.xml DESTINATION ./share/appdata)
@@ -116,7 +116,7 @@ else(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOU
endif(NOT ${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND")
endif(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
-add_custom_target(darktablerc ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktablerc)
+add_custom_target(darktable_rc_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktablerc)
# first of all install darktablerc file into share as template
# postinst script should copy this into users homedirectory

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-doc_CMakeLists_txt,v 1.5 2015/10/05 08:48:51 dcoppa Exp $
Fix conflicting target name
--- doc/CMakeLists.txt.orig Mon Oct 5 10:27:05 2015
+++ doc/CMakeLists.txt Mon Oct 5 10:27:30 2015
@@ -58,7 +58,7 @@ else(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOU
endif(NOT ${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND")
endif(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND")
-add_custom_target(darktablerc.html ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html)
+add_custom_target(darktablerc_html_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html DESTINATION ${SHARE_INSTALL}/doc/darktable/)

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_external_colord-gtk_CMakeLists_txt,v 1.1 2015/06/10 22:27:29 sthen Exp $
--- src/external/colord-gtk/CMakeLists.txt.orig Wed Jun 10 23:09:07 2015
+++ src/external/colord-gtk/CMakeLists.txt Wed Jun 10 23:09:24 2015
@@ -6,6 +6,7 @@ set(COLORD_GTK_SOURCES
)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
add_definitions("-DCD_COMPILATION")
+include_directories(SYSTEM "/usr/X11R6/include")
add_library(colord-gtk STATIC ${COLORD_GTK_SOURCES})
target_link_libraries(colord-gtk)

View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.12 2015/08/11 20:46:04 sthen Exp $
@comment $OpenBSD: PLIST,v 1.13 2015/12/24 14:20:20 sthen Exp $
@bin bin/darktable
@bin bin/darktable-cli
@bin bin/darktable-cltest
@bin bin/darktable-cmstest
@bin bin/darktable-generate-cache
@bin bin/darktable-viewer
lib/darktable/
lib/darktable/libdarktable.so
@ -13,6 +14,7 @@ lib/darktable/plugins/imageio/format/libcopy.so
lib/darktable/plugins/imageio/format/libexr.so
lib/darktable/plugins/imageio/format/libj2k.so
lib/darktable/plugins/imageio/format/libjpeg.so
lib/darktable/plugins/imageio/format/libpdf.so
lib/darktable/plugins/imageio/format/libpfm.so
lib/darktable/plugins/imageio/format/libpng.so
lib/darktable/plugins/imageio/format/libppm.so
@ -44,6 +46,7 @@ lib/darktable/plugins/libcolorin.so
lib/darktable/plugins/libcolorize.so
lib/darktable/plugins/libcolormapping.so
lib/darktable/plugins/libcolorout.so
lib/darktable/plugins/libcolorreconstruct.so
lib/darktable/plugins/libcolortransfer.so
lib/darktable/plugins/libcolorzones.so
lib/darktable/plugins/libdefringe.so
@ -52,6 +55,7 @@ lib/darktable/plugins/libdenoiseprofile.so
lib/darktable/plugins/libdither.so
lib/darktable/plugins/libequalizer.so
lib/darktable/plugins/libexposure.so
lib/darktable/plugins/libfinalscale.so
lib/darktable/plugins/libflip.so
lib/darktable/plugins/libgamma.so
lib/darktable/plugins/libglobaltonemap.so
@ -62,7 +66,6 @@ lib/darktable/plugins/libhighpass.so
lib/darktable/plugins/libhotpixels.so
lib/darktable/plugins/libinvert.so
lib/darktable/plugins/liblens.so
lib/darktable/plugins/libletsgofloat.so
lib/darktable/plugins/liblevels.so
lib/darktable/plugins/liblowlight.so
lib/darktable/plugins/liblowpass.so
@ -71,6 +74,7 @@ lib/darktable/plugins/libnlmeans.so
lib/darktable/plugins/liboverexposed.so
lib/darktable/plugins/libprofile_gamma.so
lib/darktable/plugins/librawdenoise.so
lib/darktable/plugins/librawprepare.so
lib/darktable/plugins/librelight.so
lib/darktable/plugins/librotatepixels.so
lib/darktable/plugins/libscalepixels.so
@ -116,6 +120,7 @@ lib/darktable/plugins/lighttable/libmodule_toolbox.so
lib/darktable/plugins/lighttable/libmodulegroups.so
lib/darktable/plugins/lighttable/libmodulelist.so
lib/darktable/plugins/lighttable/libnavigation.so
lib/darktable/plugins/lighttable/libprint_settings.so
lib/darktable/plugins/lighttable/libratings.so
lib/darktable/plugins/lighttable/librecentcollect.so
lib/darktable/plugins/lighttable/libselect.so
@ -129,16 +134,21 @@ lib/darktable/views/
lib/darktable/views/libdarkroom.so
lib/darktable/views/liblighttable.so
lib/darktable/views/libmap.so
lib/darktable/views/libprint.so
lib/darktable/views/libslideshow.so
lib/darktable/views/libtethering.so
lib/libdarktable.so
@man man/man1/darktable-cli.1
@man man/man1/darktable-cltest.1
@man man/man1/darktable-cmstest.1
@man man/man1/darktable-generate-cache.1
@man man/man1/darktable-viewer.1
@man man/man1/darktable.1
share/appdata/
share/appdata/darktable.appdata.xml
share/applications/darktable.desktop
share/darktable/
share/darktable/darktable.gtkrc
share/darktable/darktable.css
share/darktable/darktablerc
share/darktable/gdb_commands
share/darktable/js/
@ -154,8 +164,10 @@ share/darktable/kernels/basic.cl
share/darktable/kernels/bilateral.cl
share/darktable/kernels/blendop.cl
share/darktable/kernels/bloom.cl
share/darktable/kernels/colorreconstruction.cl
share/darktable/kernels/colorspace.cl
share/darktable/kernels/common.h
share/darktable/kernels/demosaic_other.cl
share/darktable/kernels/demosaic_ppg.cl
share/darktable/kernels/denoiseprofile.cl
share/darktable/kernels/extended.cl
@ -172,6 +184,7 @@ share/darktable/lua/darktable/
share/darktable/lua/darktable/debug.lua
share/darktable/lua/darktable/external/
share/darktable/lua/darktable/external/pygy_require/
share/darktable/lua/darktable/external/pygy_require/.gitignore
share/darktable/lua/darktable/external/pygy_require/README.md
share/darktable/lua/darktable/external/pygy_require/require.lua
share/darktable/lua/darktable/external/pygy_require/rockspecs/
@ -188,6 +201,7 @@ share/darktable/lua/darktable/external/pygy_require/rockspecs/require-0.1.6-1.ro
share/darktable/lua/darktable/external/pygy_require/rockspecs/require-0.1.7-1.rockspec
share/darktable/lua/darktable/external/pygy_require/rockspecs/require-0.1.7-2.rockspec
share/darktable/luarc
share/darktable/noiseprofiles.json
share/darktable/pixmaps/
share/darktable/pixmaps/dt_logo_128x128.png
share/darktable/pixmaps/idbutton-1.png
@ -228,6 +242,8 @@ share/darktable/pixmaps/plugins/darkroom/colormapping.png
share/darktable/pixmaps/plugins/darkroom/colormapping.svg
share/darktable/pixmaps/plugins/darkroom/colorout.png
share/darktable/pixmaps/plugins/darkroom/colorout.svg
share/darktable/pixmaps/plugins/darkroom/colorreconstruct.png
share/darktable/pixmaps/plugins/darkroom/colorreconstruct.svg
share/darktable/pixmaps/plugins/darkroom/colortransfer.png
share/darktable/pixmaps/plugins/darkroom/colortransfer.svg
share/darktable/pixmaps/plugins/darkroom/colorzones.png
@ -321,6 +337,7 @@ share/darktable/watermarks/
share/darktable/watermarks/darktable.svg
share/darktable/watermarks/hasselblad.svg
share/darktable/watermarks/promo.svg
share/darktable/watermarks/simple-text.svg
share/doc/darktable/
share/doc/darktable/AUTHORS
share/doc/darktable/LICENSE
@ -352,6 +369,7 @@ share/locale/pl/LC_MESSAGES/darktable.mo
share/locale/pt_BR/LC_MESSAGES/darktable.mo
share/locale/pt_PT/LC_MESSAGES/darktable.mo
share/locale/ru/LC_MESSAGES/darktable.mo
share/locale/sk/LC_MESSAGES/darktable.mo
share/locale/sq/LC_MESSAGES/darktable.mo
share/locale/sv/LC_MESSAGES/darktable.mo
share/locale/uk/LC_MESSAGES/darktable.mo