Attachment 150390 Details for Bug 195820 – diff -ruN output

[patch] diff -ruN output

darktable-1.6.0.patch (text/plain), 12.19 KB, created by martin on 2014-12-09 09:18:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: martin

Created: 2014-12-09 09:18:35 UTC

Size: 12.19 KB

patch

obsolete

>diff -ruN /usr/ports/graphics/darktable/Makefile ./Makefile
>--- /usr/ports/graphics/darktable/Makefile	2014-12-08 17:48:38.000000000 +0100
>+++ ./Makefile	2014-12-09 10:06:09.056120457 +0100
>@@ -2,17 +2,23 @@
> # $FreeBSD: head/graphics/darktable/Makefile 374303 2014-12-08 16:48:38Z tijl $
> 
> PORTNAME=	darktable
>-PORTVERSION=	1.4.2
>-PORTREVISION=	6
>+PORTVERSION=	1.6.0
> CATEGORIES=	graphics
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
>+MASTER_SITES=   https://github.com/${GH_ACCOUNT}/${PORTNAME}/archive/
>+DISTNAME=	release-${PORTVERSION}
>+DIST_SUBDIR=    ${PORTNAME}
>+EXTRACT_SUFX=	.tar.gz
>+WRKSRC=		${WRKDIR}/darktable-${DISTNAME}
> 
> MAINTAINER=	dumbbell@FreeBSD.org
> COMMENT=	Virtual lighttable and darkroom for photographers
> 
> LICENSE=	GPLv3
> 
>+GH_ACCOUNT=     darktable-org
>+
> BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
>+
> LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2 \
> 		liblensfun.so:${PORTSDIR}/graphics/lensfun \
> 		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
>diff -ruN /usr/ports/graphics/darktable/distinfo ./distinfo
>--- /usr/ports/graphics/darktable/distinfo	2014-06-01 20:52:21.000000000 +0200
>+++ ./distinfo	2014-12-09 00:22:22.047559153 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (darktable-1.4.2.tar.xz) = c1311a6e336007b85d21647652ebec3e26840248a968eab04ab5f0a56c2e0709
>-SIZE (darktable-1.4.2.tar.xz) = 2836340
>+SHA256 (darktable/release-1.6.0.tar.gz) = e0ccdbfa9a6b10256a23b9fd2a894751b2ce658c57231645d0d986b39d82f7e3
>+SIZE (darktable/release-1.6.0.tar.gz) = 76607320
>diff -ruN /usr/ports/graphics/darktable/files/patch-CMakeLists.txt ./files/patch-CMakeLists.txt
>--- /usr/ports/graphics/darktable/files/patch-CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-CMakeLists.txt	2014-12-09 01:28:23.381288087 +0100
>@@ -0,0 +1,11 @@
>+--- CMakeLists.txt.orig	2014-12-09 01:27:27.104292195 +0100
>++++ CMakeLists.txt	2014-12-09 01:27:51.944293889 +0100
>+@@ -101,7 +101,7 @@
>+ 			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
>+ 	configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.cmake.cmake" "${CMAKE_CURRENT_BINARY_DIR}/version.cmake" @ONLY)
>+ else(NOT SOURCE_PACKAGE)
>+-	include(cmake/version.cmake)
>++	include(cmake/version.cmake.cmake)
>+ endif()
>+ 
>+ #
>diff -ruN /usr/ports/graphics/darktable/files/patch-cmake-version.cmake.cmake ./files/patch-cmake-version.cmake.cmake
>--- /usr/ports/graphics/darktable/files/patch-cmake-version.cmake.cmake	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-cmake-version.cmake.cmake	2014-12-09 02:05:09.965138934 +0100
>@@ -0,0 +1,5 @@
>+--- cmake/version.cmake.cmake.orig	2014-12-09 02:03:55.354143752 +0100
>++++ cmake/version.cmake.cmake	2014-12-09 02:05:04.430139590 +0100
>+@@ -1 +1 @@
>+-set(PROJECT_VERSION "@PROJECT_VERSION@")
>++set(PROJECT_VERSION "1.6.0")
>diff -ruN /usr/ports/graphics/darktable/files/patch-src-CMakeLists.txt ./files/patch-src-CMakeLists.txt
>--- /usr/ports/graphics/darktable/files/patch-src-CMakeLists.txt	2014-06-01 20:52:21.000000000 +0200
>+++ ./files/patch-src-CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>@@ -1,15 +0,0 @@
>---- src/CMakeLists.txt
>-+++ src/CMakeLists.txt
>-@@ -438,10 +438,10 @@ else()
>- endif()
>- 
>- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -g")
>--set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math ${MARCH}")
>-+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fno-finite-math-only ${MARCH}")
>- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g")
>- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -g")
>--set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math ${MARCH}")
>-+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fno-finite-math-only ${MARCH}")
>- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g")
>- if(CMAKE_COMPILER_IS_GNUCC)
>- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse")
>diff -ruN /usr/ports/graphics/darktable/pkg-plist ./pkg-plist
>--- /usr/ports/graphics/darktable/pkg-plist	2014-10-20 19:04:20.000000000 +0200
>+++ ./pkg-plist	2014-12-09 09:43:56.351136352 +0100
>@@ -1,6 +1,7 @@
> bin/darktable
> bin/darktable-cli
> bin/darktable-cltest
>+bin/darktable-cmstest
> %%SLIDESHOW%%bin/darktable-viewer
> lib/darktable/libdarktable.so
> lib/darktable/plugins/imageio/format/libcopy.so
>@@ -39,6 +40,7 @@
> lib/darktable/plugins/libcolorout.so
> lib/darktable/plugins/libcolortransfer.so
> lib/darktable/plugins/libcolorzones.so
>+lib/darktable/plugins/libdefringe.so
> lib/darktable/plugins/libdemosaic.so
> lib/darktable/plugins/libdenoiseprofile.so
> lib/darktable/plugins/libdither.so
>@@ -54,6 +56,7 @@
> 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
>@@ -63,6 +66,8 @@
> lib/darktable/plugins/libprofile_gamma.so
> lib/darktable/plugins/librawdenoise.so
> lib/darktable/plugins/librelight.so
>+lib/darktable/plugins/librotatepixels.so
>+lib/darktable/plugins/libscalepixels.so
> lib/darktable/plugins/libshadhi.so
> lib/darktable/plugins/libsharpen.so
> lib/darktable/plugins/libsoften.so
>@@ -78,7 +83,6 @@
> lib/darktable/plugins/libzonesystem.so
> lib/darktable/plugins/lighttable/libbackgroundjobs.so
> %%GPHOTO%%lib/darktable/plugins/lighttable/libcamera.so
>-%%GPHOTO%%lib/darktable/plugins/lighttable/libcapture.so
> lib/darktable/plugins/lighttable/libcollect.so
> lib/darktable/plugins/lighttable/libcolorlabels.so
> lib/darktable/plugins/lighttable/libcolorpicker.so
>@@ -108,15 +112,17 @@
> lib/darktable/plugins/lighttable/libratings.so
> lib/darktable/plugins/lighttable/librecentcollect.so
> lib/darktable/plugins/lighttable/libselect.so
>+lib/darktable/plugins/lighttable/libsession.so
> lib/darktable/plugins/lighttable/libsnapshots.so
> lib/darktable/plugins/lighttable/libstyles.so
> lib/darktable/plugins/lighttable/libtagging.so
> lib/darktable/plugins/lighttable/libview_toolbox.so
> lib/darktable/plugins/lighttable/libviewswitcher.so
>-%%GPHOTO%%lib/darktable/views/libcapture.so
> lib/darktable/views/libdarkroom.so
> lib/darktable/views/liblighttable.so
>+lib/darktable/views/libslideshow.so
> %%GEO%%lib/darktable/views/libmap.so
>+lib/darktable/views/libtethering.so
> man/man1/darktable-cli.1.gz
> man/man1/darktable.1.gz
> share/appdata/darktable.appdata.xml
>@@ -150,60 +156,112 @@
> %%LUA%%%%DATADIR%%/lua/darktable/debug.lua
> %%LUA%%%%DATADIR%%/luarc
> %%DATADIR%%/pixmaps/dt_logo_128x128.png
>+%%DATADIR%%/pixmaps/idbutton-1.png
>+%%DATADIR%%/pixmaps/idbutton-1.svg
> %%DATADIR%%/pixmaps/idbutton-2.png
>+%%DATADIR%%/pixmaps/idbutton-2.svg
> %%DATADIR%%/pixmaps/idbutton.png
>-%%DATADIR%%/pixmaps/off.png
>-%%DATADIR%%/pixmaps/plugins/darkroom/anlfyeni.png
>+%%DATADIR%%/pixmaps/idbutton.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/atrous.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/atrous.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/basecurve.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/basecurve.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/bilateral.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/bilateral.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/bloom.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/bloom.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/borders.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/borders.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/cacorrect.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/cacorrect.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/channelmixer.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/channelmixer.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/clahe.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/clahe.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/clipping.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/clipping.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/colisa.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/colisa.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/colorcorrection.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/colorcorrection.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/colorin.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/colorin.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/colormapping.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/colormapping.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/colorout.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/colorout.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/colortransfer.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/colortransfer.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/colorzones.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/colorzones.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/demosaic.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/demosaic.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/dither.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/dither.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/exposure.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/exposure.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/flip.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/flip.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/graduatednd.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/graduatednd.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/grain.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/grain.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/highlights.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/highlights.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/highpass.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/highpass.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/hotpixels.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/hotpixels.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/invert.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/invert.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/lens.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/lens.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/levels.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/levels.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/lowlight.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/lowlight.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/lowpass.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/lowpass.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/monochrome.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/monochrome.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/nlmeans.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/nlmeans.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/overexposed.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/overexposed.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/profile_gamma.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/profile_gamma.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/rawdenoise.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/rawdenoise.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/rawimport.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/rawimport.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/relight.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/relight.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/shadhi.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/shadhi.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/sharpen.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/sharpen.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/soften.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/soften.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/splittoning.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/splittoning.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/spots.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/spots.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/temperature.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/temperature.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/template.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/template.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/tonecurve.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/tonecurve.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/tonemap.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/tonemap.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/velvia.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/velvia.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/vignette.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/vignette.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/watermark.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/watermark.svg
> %%DATADIR%%/pixmaps/plugins/darkroom/zonesystem.png
>+%%DATADIR%%/pixmaps/plugins/darkroom/zonesystem.svg
> %%RAWSPEED%%%%DATADIR%%/rawspeed/cameras.xml
> %%RAWSPEED%%%%DATADIR%%/rawspeed/showcameras.xsl
> %%DATADIR%%/style/bullet.gif
>@@ -234,8 +292,10 @@
> share/icons/hicolor/32x32/apps/darktable.png
> share/icons/hicolor/48x48/apps/darktable.png
> share/icons/hicolor/64x64/apps/darktable.png
>+share/icons/hicolor/scalable/apps/darktable-1.svg
> share/icons/hicolor/scalable/apps/darktable-2.svg
> share/icons/hicolor/scalable/apps/darktable.svg
>+%%NLS%%share/locale/ca/LC_MESSAGES/darktable.mo
> %%NLS%%share/locale/cs/LC_MESSAGES/darktable.mo
> %%NLS%%share/locale/da/LC_MESSAGES/darktable.mo
> %%NLS%%share/locale/de/LC_MESSAGES/darktable.mo

Actions: View | Diff

Attachments on bug 195820: 150390