Attachment 178571 Details for Bug 215675 – v0.3

[patch] v0.3

rawtherapee.cleanup.diff (text/plain), 10.25 KB, created by Jan Beich on 2017-01-06 10:01:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-01-06 10:01:05 UTC

Size: 10.25 KB

patch

obsolete

>Index: graphics/rawtherapee/Makefile
>===================================================================
>--- graphics/rawtherapee/Makefile	(revision 430692)
>+++ graphics/rawtherapee/Makefile	(working copy)
>@@ -12,72 +12,52 @@ COMMENT=	Powerful RAW image processing application
> 
> LICENSE=	GPLv3
> 
>-LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24 \
>+LIB_DEPENDS=	libcanberra-gtk.so:audio/libcanberra \
>+		libsigc-2.0.so:devel/libsigc++20 \
>+		liblcms2.so:graphics/lcms2 \
> 		libiptcdata.so:graphics/libiptcdata \
>-		liblcms2.so:graphics/lcms2 \
> 		libpng.so:graphics/png \
> 		libtiff.so:graphics/tiff \
>-		libsigc-2.0.so:devel/libsigc++20 \
> 		libfftw3.so:math/fftw3 \
> 		libfftw3f.so:math/fftw3-float \
>-		libcanberra-gtk3.so:audio/libcanberra-gtk3
>+		libexpat.so:textproc/expat2
> 
>-USES=		cmake:outsource compiler:gcc-c++11-lib desktop-file-utils dos2unix \
>-		jpeg pkgconfig tar:xz
>+USES=		cmake:outsource desktop-file-utils dos2unix \
>+		jpeg localbase:ldflags pkgconfig tar:xz
>+USE_GNOME=	gtkmm24
> DOS2UNIX_REGEX=	.*\.(cc|h)
>-USE_GNOME=	gtk20 glib20
>-USE_LDCONFIG=	yes
>-CFLAGS+=	-I${LOCALBASE}/include -fPIC
>-CXXFLAGS+=	-I${LOCALBASE}/include -fPIC
>-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
>-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
>-		LDFLAGS="${LDFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}"
>+LDFLAGS+=	-Wl,--as-needed # fontconfig, freetype, gettext, libX11
> CMAKE_ARGS+=	-DDOCDIR="${DOCSDIR}" \
> 		-DCREDITSDIR="${DOCSDIR}" \
> 		-DLICENCEDIR="${DOCSDIR}" \
> 		-DDESKTOPDIR="${DESKTOPDIR}" \
> 		-DDATADIR="${DATADIR}" \
>-		-DCMAKE_C_FLAGS="${CFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}" \
>-		-DCMAKE_CXX_FLAGS="${CXXFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}" \
> 		-DCACHE_NAME_SUFFIX="4.1"
>-SUB_FILES=	rawtherapee
>-SUB_LIST=	RTDIR="${RTDIR}"
> INSTALLS_ICONS=	yes
> 
>-.if defined(PACKAGE_BUILDING)
>-CMAKE_ARGS+=	-DPROC_TARGET_NUMBER="1"
>-.endif
>+OPTIONS_DEFINE=		OPENMP OPTIMIZED_CFLAGS
>+OPTIONS_DEFAULT=	OPENMP OPTIMIZED_CFLAGS
>+OPTIONS_DEFINE_i386=	SSE2
>+OPTIONS_DEFAULT_i386=	SSE2
> 
>-RTDIR=		${PREFIX}/libdata/${PORTNAME}
>-
>-OPTIONS_DEFINE=		OPTIMIZED_CFLAGS OPENMP
>-OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS OPENMP
>-OPENMP_DESC=		Enable multicore processing using OpenMP
>-OPTIMIZED_CFLAGS_DESC=	Use extra compiler optimizations (requires SSE2 support)
>-
>+OPENMP_USES=		compiler:gcc-c++11-lib
> OPENMP_CMAKE_BOOL=	OPTION_OMP
> 
>-.include <bsd.port.pre.mk>
>+OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops \
>+			${OPTIMIZED_CFLAGS_CFLAGS_${CHOSEN_COMPILER_TYPE}}
>+OPTIMIZED_CFLAGS_CFLAGS_gcc=	-fexpensive-optimizations
> 
>-# -------------------------------------------------------------------
>+SSE2_DESC=		${SSE_DESC:S/SSE/SSE2/}
>+SSE2_CFLAGS=		-msse2
> 
>-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
>-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
>-CFLAGS+=	-O3 -fexpensive-optimizations \
>-		-funroll-loops -msse2
>-CXXFLAGS+=	-O3 \
>-		-funroll-loops -msse2
>+.if ! ${CFLAGS:M-march*}
>+CMAKE_ARGS+=		${CMAKE_ARGS_${ARCH}}
>+CMAKE_ARGS_i386=	-DPROC_TARGET_NUMBER="1"
>+CMAKE_ARGS_amd64=	${CMAKE_ARGS_i386}
> .endif
>-.endif
> 
>-# -------------------------------------------------------------------
>-
> post-patch:
>-	@${REINPLACE_CMD} -e 's#<auto_ptr.h>#<memory>#g' \
>-		${WRKSRC}/rtgui/darkframe.h \
>-		${WRKSRC}/rtgui/flatfield.h \
>-		${WRKSRC}/rtgui/icmpanel.h
>-	@${REINPLACE_CMD} -e 's#DESTINATION "$${CMAKE_INSTALL_PREFIX}/share/man/man1"#DESTINATION "${MANPREFIX}/man/man1/"#' \
>+	@${REINPLACE_CMD} -e '/DESTINATION/s#share/man#man#' \
> 		${WRKSRC}/CMakeLists.txt
> 	${RM} ${WRKSRC}/rtengine/dcraw.patch \
> 		${WRKSRC}/rtengine/dcraw.c
>@@ -88,4 +68,4 @@ post-install:
> 	${SETENV} HOME=/dev/null ${STAGEDIR}${PREFIX}/bin/rawtherapee --help 2>&1 \
> 	| ${EGREP} -q "RawTherapee, version ${PKGVERSION:C/_.*//:C/,.*//}"
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: graphics/rawtherapee/files/patch-CMakeLists.txt
>===================================================================
>--- graphics/rawtherapee/files/patch-CMakeLists.txt	(revision 430692)
>+++ graphics/rawtherapee/files/patch-CMakeLists.txt	(nonexistent)
>@@ -1,13 +0,0 @@
>-# This is required so that the RPATH information for libgcc/libgomp is
>-# not stripped during CMake's install phase: -- mandree
>-
>---- ./CMakeLists.txt.orig	2013-06-15 19:16:41.000000000 +0200
>-+++ ./CMakeLists.txt	2013-06-15 19:17:02.000000000 +0200
>-@@ -6,6 +6,7 @@
>- endif (WIN32)
>- 
>- PROJECT(RawTherapee)
>-+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
>- 
>- # the default target is 'Debug'
>- if (CMAKE_BUILD_TYPE STREQUAL "")
>
>Property changes on: graphics/rawtherapee/files/patch-CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: graphics/rawtherapee/files/patch-rtengine_dcraw.cc
>===================================================================
>--- graphics/rawtherapee/files/patch-rtengine_dcraw.cc	(nonexistent)
>+++ graphics/rawtherapee/files/patch-rtengine_dcraw.cc	(working copy)
>@@ -0,0 +1,12 @@
>+--- rtengine/dcraw.cc.orig	2014-10-24 19:03:26 UTC
>++++ rtengine/dcraw.cc
>+@@ -8726,7 +8726,8 @@ static void decodeFPDeltaRow(Bytef * src
>+       dst[col*3 + 2] = src[col + realTileWidth*2];
>+     }
>+   } else {
>+-    if (((union { uint32_t x; uint8_t c; }){1}).c) {
>++    union X { uint32_t x; uint8_t c; };
>++    if (((union X){1}).c) {
>+ 		for (size_t col = 0; col < tileWidth; ++col) {
>+ 			for (size_t byte = 0; byte < bytesps; ++byte)
>+ 				dst[col*bytesps + byte] = src[col + realTileWidth*(bytesps-byte-1)];  // Little endian
>
>Property changes on: graphics/rawtherapee/files/patch-rtengine_dcraw.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/rawtherapee/files/patch-rtengine_improcfun.h
>===================================================================
>--- graphics/rawtherapee/files/patch-rtengine_improcfun.h	(revision 430692)
>+++ graphics/rawtherapee/files/patch-rtengine_improcfun.h	(nonexistent)
>@@ -1,14 +0,0 @@
>---- ./rtengine/improcfun.h.orig	2012-01-31 05:00:05.000000000 +0400
>-+++ ./rtengine/improcfun.h	2012-03-31 11:46:27.000000000 +0400
>-@@ -19,6 +19,11 @@
>- #ifndef _IMPROCFUN_H_
>- #define _IMPROCFUN_H_
>- 
>-+#include <sys/param.h>
>-+#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
>-+#define log2(x) (log(x) / M_LN2)
>-+#endif
>-+
>- #include "imagefloat.h"
>- #include "image16.h"
>- #include "image8.h"
>
>Property changes on: graphics/rawtherapee/files/patch-rtengine_improcfun.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: graphics/rawtherapee/files/patch-rtengine_sleef.c
>===================================================================
>--- graphics/rawtherapee/files/patch-rtengine_sleef.c	(nonexistent)
>+++ graphics/rawtherapee/files/patch-rtengine_sleef.c	(working copy)
>@@ -0,0 +1,13 @@
>+rtengine/sleef.c:792: error: integer constant is too large for 'long' type
>+
>+--- rtengine/sleef.c.orig	2014-10-24 19:03:26 UTC
>++++ rtengine/sleef.c
>+@@ -789,7 +789,7 @@ __inline double xsqrt(double d) { // max
>+   }
>+ 
>+   // http://en.wikipedia.org/wiki/Fast_inverse_square_root
>+-  double x = longBitsToDouble(0x5fe6ec85e7de30da - (doubleToRawLongBits(d + 1e-320) >> 1));
>++  double x = longBitsToDouble(0x5fe6ec85e7de30daull - (doubleToRawLongBits(d + 1e-320) >> 1));
>+ 
>+   x = x * (1.5 - 0.5 * d * x * x);
>+   x = x * (1.5 - 0.5 * d * x * x);
>
>Property changes on: graphics/rawtherapee/files/patch-rtengine_sleef.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/rawtherapee/files/patch-rtgui_soundman.cc
>===================================================================
>--- graphics/rawtherapee/files/patch-rtgui_soundman.cc	(nonexistent)
>+++ graphics/rawtherapee/files/patch-rtgui_soundman.cc	(working copy)
>@@ -0,0 +1,22 @@
>+--- rtgui/soundman.cc.orig	2014-10-24 19:03:26 UTC
>++++ rtgui/soundman.cc
>+@@ -24,9 +24,7 @@
>+ #ifdef WIN32
>+ #include <windows.h>
>+ #include <mmsystem.h>
>+-#endif
>+-
>+-#ifdef __linux__
>++#elif !defined(__APPLE__)
>+ #include <canberra-gtk.h>
>+ #endif
>+ 
>+@@ -65,7 +63,7 @@ void SoundManager::playSoundAsync(const 
>+     wchar_t *wfilename = (wchar_t*)g_utf8_to_utf16 (sound.c_str(), -1, NULL, NULL, NULL);
>+     PlaySoundW(wfilename, NULL, sndParam);
>+     g_free( wfilename );
>+-#elif defined(__linux__)
>++#elif !defined(__APPLE__)
>+     ca_context_play(ca_gtk_context_get(), 0, CA_PROP_EVENT_ID, sound.c_str(), CA_PROP_MEDIA_FILENAME, sound.c_str(), NULL);
>+ #endif
>+ }
>
>Property changes on: graphics/rawtherapee/files/patch-rtgui_soundman.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/rawtherapee/files/rawtherapee.in
>===================================================================
>--- graphics/rawtherapee/files/rawtherapee.in	(revision 430692)
>+++ graphics/rawtherapee/files/rawtherapee.in	(nonexistent)
>@@ -1,8 +0,0 @@
>-#!/bin/csh
>-#
>-# $FreeBSD$
>-
>-set RTH = "%%RTDIR%%/rth"
>-set CONFDIR = "%%RTDIR%%"
>-
>-exec "${RTH}" ${CONFDIR}
>
>Property changes on: graphics/rawtherapee/files/rawtherapee.in
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 215675: 178405 | 178406 | 178407 | 178416 | 178571