Attachment #178571 for bug #215675





LICENSE=	GPLv3

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 \
		libexpat.so:textproc/expat2

USES=		cmake:outsource desktop-file-utils dos2unix \
		jpeg localbase:ldflags pkgconfig tar:xz
USE_GNOME=	gtkmm24
DOS2UNIX_REGEX=	.*\.(cc|h)
LDFLAGS+=	-Wl,--as-needed # fontconfig, freetype, gettext, libX11
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}||}"
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

OPTIONS_DEFINE=		OPENMP OPTIMIZED_CFLAGS
OPTIONS_DEFAULT=	OPENMP OPTIMIZED_CFLAGS
OPTIONS_DEFINE_i386=	SSE2
OPTIONS_DEFAULT_i386=	SSE2

OPENMP_USES=		compiler:gcc-c++11-lib

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_CMAKE_BOOL=	OPTION_OMP

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 ! ${CFLAGS:M-march*}
CMAKE_ARGS+=		${CMAKE_ARGS_${ARCH}}
CMAKE_ARGS_i386=	-DPROC_TARGET_NUMBER="1"
CMAKE_ARGS_amd64=	${CMAKE_ARGS_i386}
CXXFLAGS+=	-O3 \
		-funroll-loops -msse2
.endif
.endif

# -------------------------------------------------------------------

post-patch:
	@${REINPLACE_CMD} -e '/DESTINATION/s#share/man#man#' \
		${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/"#' \
		${WRKSRC}/CMakeLists.txt
	${RM} ${WRKSRC}/rtengine/dcraw.patch \
		${WRKSRC}/rtengine/dcraw.c

	${SETENV} HOME=/dev/null ${STAGEDIR}${PREFIX}/bin/rawtherapee --help 2>&1 \
	| ${EGREP} -q "RawTherapee, version ${PKGVERSION:C/_.*//:C/,.*//}"

.include <bsd.port.mk>




# 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 "")




--- 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




--- ./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"




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);




--- 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
 }

Lines 1-8 Link Here

(-)graphics/rawtherapee/files/rawtherapee.in (-8 lines)
1	#!/bin/csh
2	#
3	# $FreeBSD$
4
5	set RTH = "%%RTDIR%%/rth"
6	set CONFDIR = "%%RTDIR%%"
7
8	exec "${RTH}" ${CONFDIR}

Return to bug 215675

Lines 12-83 COMMENT= Powerful RAW image processing application Link Here

(-)graphics/rawtherapee/Makefile (-44 / +24 lines)
12		12
13	LICENSE= GPLv3	13	LICENSE= GPLv3
14		14
15	LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24 \	15	LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \
		16	libsigc-2.0.so:devel/libsigc++20 \
		17	liblcms2.so:graphics/lcms2 \
16	libiptcdata.so:graphics/libiptcdata \	18	libiptcdata.so:graphics/libiptcdata \
17	liblcms2.so:graphics/lcms2 \
18	libpng.so:graphics/png \	19	libpng.so:graphics/png \
19	libtiff.so:graphics/tiff \	20	libtiff.so:graphics/tiff \
20	libsigc-2.0.so:devel/libsigc++20 \
21	libfftw3.so:math/fftw3 \	21	libfftw3.so:math/fftw3 \
22	libfftw3f.so:math/fftw3-float \	22	libfftw3f.so:math/fftw3-float \
23	libcanberra-gtk3.so:audio/libcanberra-gtk3	23	libexpat.so:textproc/expat2
24		24
25	USES= cmake:outsource compiler:gcc-c++11-lib desktop-file-utils dos2unix \	25	USES= cmake:outsource desktop-file-utils dos2unix \
26	jpeg pkgconfig tar:xz	26	jpeg localbase:ldflags pkgconfig tar:xz
		27	USE_GNOME= gtkmm24
27	DOS2UNIX_REGEX= .*\.(cc\|h)	28	DOS2UNIX_REGEX= .*\.(cc\|h)
28	USE_GNOME= gtk20 glib20	29	LDFLAGS+= -Wl,--as-needed # fontconfig, freetype, gettext, libX11
29	USE_LDCONFIG= yes
30	CFLAGS+= -I${LOCALBASE}/include -fPIC
31	CXXFLAGS+= -I${LOCALBASE}/include -fPIC
32	LDFLAGS+= -lpthread -L${LOCALBASE}/lib
33	CONFIGURE_ENV= CFLAGS="${CFLAGS}" \
34	LDFLAGS="${LDFLAGS:C\|-Wl,-rpath=${_GCC_RUNTIME}\|\|:C\|-L${_GCC_RUNTIME}\|\|}"
35	CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}" \	30	CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}" \
36	-DCREDITSDIR="${DOCSDIR}" \	31	-DCREDITSDIR="${DOCSDIR}" \
37	-DLICENCEDIR="${DOCSDIR}" \	32	-DLICENCEDIR="${DOCSDIR}" \
38	-DDESKTOPDIR="${DESKTOPDIR}" \	33	-DDESKTOPDIR="${DESKTOPDIR}" \
39	-DDATADIR="${DATADIR}" \	34	-DDATADIR="${DATADIR}" \
40	-DCMAKE_C_FLAGS="${CFLAGS:C\|-Wl,-rpath=${_GCC_RUNTIME}\|\|:C\|-L${_GCC_RUNTIME}\|\|}" \
41	-DCMAKE_CXX_FLAGS="${CXXFLAGS:C\|-Wl,-rpath=${_GCC_RUNTIME}\|\|:C\|-L${_GCC_RUNTIME}\|\|}" \
42	-DCACHE_NAME_SUFFIX="4.1"	35	-DCACHE_NAME_SUFFIX="4.1"
43	SUB_FILES= rawtherapee
44	SUB_LIST= RTDIR="${RTDIR}"
45	INSTALLS_ICONS= yes	36	INSTALLS_ICONS= yes
46		37
47	.if defined(PACKAGE_BUILDING)	38	OPTIONS_DEFINE= OPENMP OPTIMIZED_CFLAGS
48	CMAKE_ARGS+= -DPROC_TARGET_NUMBER="1"	39	OPTIONS_DEFAULT= OPENMP OPTIMIZED_CFLAGS
49	.endif	40	OPTIONS_DEFINE_i386= SSE2
		41	OPTIONS_DEFAULT_i386= SSE2
50		42
51	RTDIR= ${PREFIX}/libdata/${PORTNAME}	43	OPENMP_USES= compiler:gcc-c++11-lib
52
53	OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPENMP
54	OPTIONS_DEFAULT= OPTIMIZED_CFLAGS OPENMP
55	OPENMP_DESC= Enable multicore processing using OpenMP
56	OPTIMIZED_CFLAGS_DESC= Use extra compiler optimizations (requires SSE2 support)
57
58	OPENMP_CMAKE_BOOL= OPTION_OMP	44	OPENMP_CMAKE_BOOL= OPTION_OMP
59		45
60	.include <bsd.port.pre.mk>	46	OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops \
		47	${OPTIMIZED_CFLAGS_CFLAGS_${CHOSEN_COMPILER_TYPE}}
		48	OPTIMIZED_CFLAGS_CFLAGS_gcc= -fexpensive-optimizations
61		49
62	# -------------------------------------------------------------------	50	SSE2_DESC= ${SSE_DESC:S/SSE/SSE2/}
		51	SSE2_CFLAGS= -msse2
63		52
64	.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386"	53	.if ! ${CFLAGS:M-march*}
65	.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}	54	CMAKE_ARGS+= ${CMAKE_ARGS_${ARCH}}
66	CFLAGS+= -O3 -fexpensive-optimizations \	55	CMAKE_ARGS_i386= -DPROC_TARGET_NUMBER="1"
67	-funroll-loops -msse2	56	CMAKE_ARGS_amd64= ${CMAKE_ARGS_i386}
68	CXXFLAGS+= -O3 \
69	-funroll-loops -msse2
70	.endif	57	.endif
71	.endif
72		58
73	# -------------------------------------------------------------------
74
75	post-patch:	59	post-patch:
76	@${REINPLACE_CMD} -e 's#<auto_ptr.h>#<memory>#g' \	60	@${REINPLACE_CMD} -e '/DESTINATION/s#share/man#man#' \
77	${WRKSRC}/rtgui/darkframe.h \
78	${WRKSRC}/rtgui/flatfield.h \
79	${WRKSRC}/rtgui/icmpanel.h
80	@${REINPLACE_CMD} -e 's#DESTINATION "$${CMAKE_INSTALL_PREFIX}/share/man/man1"#DESTINATION "${MANPREFIX}/man/man1/"#' \
81	${WRKSRC}/CMakeLists.txt	61	${WRKSRC}/CMakeLists.txt
82	${RM} ${WRKSRC}/rtengine/dcraw.patch \	62	${RM} ${WRKSRC}/rtengine/dcraw.patch \
83	${WRKSRC}/rtengine/dcraw.c	63	${WRKSRC}/rtengine/dcraw.c
Lines 88-91 post-install: Link Here
88	${SETENV} HOME=/dev/null ${STAGEDIR}${PREFIX}/bin/rawtherapee --help 2>&1 \	68	${SETENV} HOME=/dev/null ${STAGEDIR}${PREFIX}/bin/rawtherapee --help 2>&1 \
89	\| ${EGREP} -q "RawTherapee, version ${PKGVERSION:C/_.//:C/,.//}"	69	\| ${EGREP} -q "RawTherapee, version ${PKGVERSION:C/_.//:C/,.//}"
90		70
91	.include <bsd.port.post.mk>	71	.include <bsd.port.mk>

Lines 1-13 Link Here

(-)graphics/rawtherapee/files/patch-CMakeLists.txt (-13 lines)
1	# This is required so that the RPATH information for libgcc/libgomp is
2	# not stripped during CMake's install phase: -- mandree
3
4	--- ./CMakeLists.txt.orig 2013-06-15 19:16:41.000000000 +0200
5	+++ ./CMakeLists.txt 2013-06-15 19:17:02.000000000 +0200
6	@@ -6,6 +6,7 @@
7	endif (WIN32)
8
9	PROJECT(RawTherapee)
10	+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
11
12	# the default target is 'Debug'
13	if (CMAKE_BUILD_TYPE STREQUAL "")

Line 0 Link Here

(-)graphics/rawtherapee/files/patch-rtengine_dcraw.cc (+12 lines)
	1	--- rtengine/dcraw.cc.orig 2014-10-24 19:03:26 UTC
	2	+++ rtengine/dcraw.cc
	3	@@ -8726,7 +8726,8 @@ static void decodeFPDeltaRow(Bytef * src
	4	dst[col3 + 2] = src[col + realTileWidth2];
	5	}
	6	} else {
	7	- if (((union { uint32_t x; uint8_t c; }){1}).c) {
	8	+ union X { uint32_t x; uint8_t c; };
	9	+ if (((union X){1}).c) {
	10	for (size_t col = 0; col < tileWidth; ++col) {
	11	for (size_t byte = 0; byte < bytesps; ++byte)
	12	dst[colbytesps + byte] = src[col + realTileWidth(bytesps-byte-1)]; // Little endian

Lines 1-14 Link Here

(-)graphics/rawtherapee/files/patch-rtengine_improcfun.h (-14 lines)
1	--- ./rtengine/improcfun.h.orig 2012-01-31 05:00:05.000000000 +0400
2	+++ ./rtengine/improcfun.h 2012-03-31 11:46:27.000000000 +0400
3	@@ -19,6 +19,11 @@
4	#ifndef _IMPROCFUN_H_
5	#define _IMPROCFUN_H_
6
7	+#include <sys/param.h>
8	+#if __FreeBSD_version <= 704100 \|\| (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) \|\| (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
9	+#define log2(x) (log(x) / M_LN2)
10	+#endif
11	+
12	#include "imagefloat.h"
13	#include "image16.h"
14	#include "image8.h"

Line 0 Link Here

(-)graphics/rawtherapee/files/patch-rtengine_sleef.c (+13 lines)
	1	rtengine/sleef.c:792: error: integer constant is too large for 'long' type
	2
	3	--- rtengine/sleef.c.orig 2014-10-24 19:03:26 UTC
	4	+++ rtengine/sleef.c
	5	@@ -789,7 +789,7 @@ __inline double xsqrt(double d) { // max
	6	}
	7
	8	// http://en.wikipedia.org/wiki/Fast_inverse_square_root
	9	- double x = longBitsToDouble(0x5fe6ec85e7de30da - (doubleToRawLongBits(d + 1e-320) >> 1));
	10	+ double x = longBitsToDouble(0x5fe6ec85e7de30daull - (doubleToRawLongBits(d + 1e-320) >> 1));
	11
	12	x = x * (1.5 - 0.5 * d * x * x);
	13	x = x * (1.5 - 0.5 * d * x * x);

Line 0 Link Here

(-)graphics/rawtherapee/files/patch-rtgui_soundman.cc (+22 lines)
	1	--- rtgui/soundman.cc.orig 2014-10-24 19:03:26 UTC
	2	+++ rtgui/soundman.cc
	3	@@ -24,9 +24,7 @@
	4	#ifdef WIN32
	5	#include <windows.h>
	6	#include <mmsystem.h>
	7	-#endif
	8	-
	9	-#ifdef __linux__
	10	+#elif !defined(__APPLE__)
	11	#include <canberra-gtk.h>
	12	#endif
	13
	14	@@ -65,7 +63,7 @@ void SoundManager::playSoundAsync(const
	15	wchar_t wfilename = (wchar_t)g_utf8_to_utf16 (sound.c_str(), -1, NULL, NULL, NULL);
	16	PlaySoundW(wfilename, NULL, sndParam);
	17	g_free( wfilename );
	18	-#elif defined(__linux__)
	19	+#elif !defined(__APPLE__)
	20	ca_context_play(ca_gtk_context_get(), 0, CA_PROP_EVENT_ID, sound.c_str(), CA_PROP_MEDIA_FILENAME, sound.c_str(), NULL);
	21	#endif
	22	}