Index: branches/2017Q1/graphics/rawtherapee/Makefile =================================================================== --- branches/2017Q1/graphics/rawtherapee/Makefile (revision 431557) +++ branches/2017Q1/graphics/rawtherapee/Makefile (revision 431558) @@ -1,91 +1,105 @@ # Created by: stas # $FreeBSD$ PORTNAME= rawtherapee PORTVERSION= 4.2 -PORTREVISION= 4 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://rawtherapee.com/shared/source/ MAINTAINER= mandree@FreeBSD.org COMMENT= Powerful RAW image processing application LICENSE= GPLv3 -LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24 \ +LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \ + libexpat.so:textproc/expat2 \ + libfftw3.so:math/fftw3 \ + libfftw3f.so:math/fftw3-float \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ 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 + libtiff.so:graphics/tiff -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 DOS2UNIX_REGEX= .*\.(cc|h) -USE_GNOME= gtk20 glib20 +LDFLAGS+= -Wl,--as-needed # fontconfig, freetype, gettext, libX11 +USE_GNOME= gtkmm24 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+= -lpthread 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}" + -DCACHE_NAME_SUFFIX="4.1" \ + -Wno-dev \ + -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW +# 3.4.x: CMAKE_EXE_LINKER_FLAGS is not passed to TRY_COMPILE by default +# any more. The CMP0056 policy must be explicitly set to NEW to ensure +# linker flags are passed. Else -lomp is not found with clang. +# See: https://cmake.org/cmake/help/v3.4/policy/CMP0056.html + INSTALLS_ICONS= yes -.if defined(PACKAGE_BUILDING) +.if defined(PACKAGE_BUILDING) && empty(CFLAGS:M-march*) CMAKE_ARGS+= -DPROC_TARGET_NUMBER="1" .endif 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 SSE support) +OPENMP_DESC= Enable multicore processing using OpenMP (amd64) +OPTIMIZED_CFLAGS_DESC= Use extra compiler optimizations (requires SSE2 support) OPENMP_CMAKE_BOOL= OPTION_OMP -.include +OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops \ + ${OPTIMIZED_CFLAGS_CFLAGS_${CHOSEN_COMPILER_TYPE}} +OPTIMIZED_CFLAGS_CFLAGS_gcc= -fexpensive-optimizations +.include + # ------------------------------------------------------------------- +# -.if ${ARCH} == "amd64" || ${ARCH} == "i386" -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CFLAGS+= -O3 -fexpensive-optimizations \ - -funroll-loops -msse -CXXFLAGS+= -O3 \ - -funroll-loops -msse +.if !empty(PORT_OPTIONS:MOPENMP) && ${ARCH} == "amd64" +LIB_DEPENDS+= libomp.so.0:devel/openmp +OPENMP_FLAGS= -lm -lomp +LDFLAGS+= ${OPENMP_FLAGS} +.if ${OSVERSION} < 1100101 +# clang 3.4 doesn't support OpenMP, +# OTOH gcc 4.9 doesn't generate usable code on FreeBSD 11. +USES+= compiler:gcc-c++11-lib .endif .endif +.if defined(WITH_DEBUG) +CMAKE_BUILD_TYPE= RelWithDebInfo +STRIP= +.endif + # ------------------------------------------------------------------- +.include + post-patch: - @${REINPLACE_CMD} -e 's###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/"#' \ ${WRKSRC}/CMakeLists.txt ${RM} ${WRKSRC}/rtengine/dcraw.patch \ ${WRKSRC}/rtengine/dcraw.c # paranoia: run rawtherapee --help to be sure it finds all its # shared libraries (this hinges on proper RPATH setting and propagation) post-install: ${SETENV} HOME=/dev/null ${STAGEDIR}${PREFIX}/bin/rawtherapee --help 2>&1 \ | ${EGREP} -q "RawTherapee, version ${PKGVERSION:C/_.*//:C/,.*//}" .include Index: branches/2017Q1/graphics/rawtherapee/files/patch-CMakeLists.txt =================================================================== --- branches/2017Q1/graphics/rawtherapee/files/patch-CMakeLists.txt (revision 431557) +++ branches/2017Q1/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: branches/2017Q1/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: branches/2017Q1/graphics/rawtherapee/files/rawtherapee.in =================================================================== --- branches/2017Q1/graphics/rawtherapee/files/rawtherapee.in (revision 431557) +++ branches/2017Q1/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: branches/2017Q1/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 Index: branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_improcfun.h =================================================================== --- branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_improcfun.h (revision 431557) +++ branches/2017Q1/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 -+#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: branches/2017Q1/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: branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_dcraw.cc =================================================================== --- branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_dcraw.cc (nonexistent) +++ branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_dcraw.cc (revision 431558) @@ -0,0 +1,12 @@ +--- rtengine/dcraw.cc.orig 2017-01-14 17:35:19 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: branches/2017Q1/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: branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_safegtk.cc =================================================================== --- branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_safegtk.cc (revision 431557) +++ branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_safegtk.cc (revision 431558) @@ -1,47 +1,47 @@ ---- ./rtengine/safegtk.cc.orig 2012-01-31 05:00:05.000000000 +0400 -+++ ./rtengine/safegtk.cc 2012-03-29 19:31:25.000000000 +0400 -@@ -98,7 +98,7 @@ +--- rtengine/safegtk.cc.orig 2017-01-14 17:35:18 UTC ++++ rtengine/safegtk.cc +@@ -184,7 +184,7 @@ void safe_build_file_list (Glib::RefPtr< Glib::RefPtr dirList; if (dir) { SAFE_ENUMERATOR_CODE_START - flist.push_back (FileMTimeInfo (removeExtension(info->get_name()), info->modification_time())); + flist.push_back (FileMTimeInfo (removeExtension(info->get_display_name()), info->modification_time())); SAFE_ENUMERATOR_CODE_END; } } -@@ -113,7 +113,7 @@ +@@ -199,7 +199,7 @@ void safe_build_file_list (Glib::RefPtr< if (dir) { if (!extensions) { SAFE_ENUMERATOR_CODE_START - names.push_back (Glib::build_filename (directory, info->get_name())); + names.push_back (Glib::build_filename (directory, info->get_display_name())); SAFE_ENUMERATOR_CODE_END; } else { -@@ -124,7 +124,7 @@ +@@ -210,7 +210,7 @@ void safe_build_file_list (Glib::RefPtr< SAFE_ENUMERATOR_CODE_START // convert the current filename to lowercase in a new ustring - Glib::ustring fname = Glib::ustring(info->get_name()).lowercase(); + Glib::ustring fname = Glib::ustring(info->get_display_name()).lowercase(); - int pos = fname.find_last_of('.'); - if (pos > -1 && pos < (fname.length()-1)) { -@@ -135,7 +135,7 @@ + size_t pos = fname.find_last_of('.'); + if (pos < (fname.length()-1)) { +@@ -221,7 +221,7 @@ void safe_build_file_list (Glib::RefPtr< // look out if it has one of the retained extensions - for (unsigned int i=0; iget_name())); + names.push_back (Glib::build_filename (directory, info->get_display_name())); break; } } -@@ -156,7 +156,7 @@ +@@ -242,7 +242,7 @@ void safe_build_subdir_list (Glib::RefPt SAFE_ENUMERATOR_CODE_START if (info->get_file_type() == Gio::FILE_TYPE_DIRECTORY && (!info->is_hidden() || add_hidden)) - subDirs.push_back (info->get_name()); + subDirs.push_back (info->get_display_name()); SAFE_ENUMERATOR_CODE_END; } } Property changes on: branches/2017Q1/graphics/rawtherapee/files/patch-rtengine_safegtk.cc ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: branches/2017Q1/graphics/rawtherapee/files/patch-rtgui_soundman.cc =================================================================== --- branches/2017Q1/graphics/rawtherapee/files/patch-rtgui_soundman.cc (nonexistent) +++ branches/2017Q1/graphics/rawtherapee/files/patch-rtgui_soundman.cc (revision 431558) @@ -0,0 +1,22 @@ +--- rtgui/soundman.cc.orig 2017-01-14 17:35:19 UTC ++++ rtgui/soundman.cc +@@ -24,9 +24,7 @@ + #ifdef WIN32 + #include + #include +-#endif +- +-#ifdef __linux__ ++#elif !defined(__APPLE__) + #include + #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: branches/2017Q1/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: branches/2017Q1/graphics/rawtherapee/pkg-message =================================================================== --- branches/2017Q1/graphics/rawtherapee/pkg-message (revision 431557) +++ branches/2017Q1/graphics/rawtherapee/pkg-message (revision 431558) @@ -1,13 +1,12 @@ ====================================================================== DISK SPACE WARNING: Note that RawTherapee uses version-dependent cache and configuration directories. Please be advised that cache directories can grow large, so be sure to check all users' $HOME/.cache/RawTherapee* and have them remove older cache directories. Also, after configurations have been moved to the new version's directory, older $HOME/.config/RawTherapee* directories may be removed. ====================================================================== - Index: branches/2017Q1 =================================================================== --- branches/2017Q1 (revision 431557) +++ branches/2017Q1 (revision 431558) Property changes on: branches/2017Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r430611,431493