diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index f8f79d3b164b..855017e14819 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -6,8 +6,7 @@ # PORTNAME= rawtherapee -PORTVERSION= 4.0.8 -PORTREVISION= 1 +PORTVERSION= 4.0.9 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE @@ -16,12 +15,12 @@ COMMENT= A powerful RAW image processing application LICENSE= GPLv3 -LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ - iptcdata.3:${PORTSDIR}/graphics/libiptcdata \ - jpeg.11:${PORTSDIR}/graphics/jpeg \ - lcms2.2:${PORTSDIR}/graphics/lcms2 \ +LIB_DEPENDS= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \ + iptcdata:${PORTSDIR}/graphics/libiptcdata \ + jpeg:${PORTSDIR}/graphics/jpeg \ + lcms2:${PORTSDIR}/graphics/lcms2 \ png15:${PORTSDIR}/graphics/png \ - tiff.4:${PORTSDIR}/graphics/tiff \ + tiff:${PORTSDIR}/graphics/tiff \ sigc-2.0:${PORTSDIR}/devel/libsigc++20 USE_CMAKE= yes @@ -52,6 +51,11 @@ OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPENMP OPTIONS_DEFAULT= OPTIMIZED_CFLAGS OPENMP OPENMP_DESC= Enable multicore processing using OpenMP +post-patch: + @${REINPLACE_CMD} -e 's###g' \ + ${WRKSRC}/rtgui/darkframe.h ${WRKSRC}/rtgui/flatfield.h \ + ${WRKSRC}/rtgui/icmpanel.h + .include .if ${ARCH} == "amd64" || ${ARCH} == "i386" @@ -63,10 +67,6 @@ CXXFLAGS+= -O3 -ffast-math -fexpensive-optimizations \ .endif .endif -#.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -#BROKEN= Does not compile on ia64, powerpc, or sparc64 -#.endif - .if ${PORT_OPTIONS:MOPENMP} CMAKE_ARGS+= -DOPTION_OMP:BOOL=ON .else diff --git a/graphics/rawtherapee/distinfo b/graphics/rawtherapee/distinfo index 66d8d8f96b62..9fb1ff664bf8 100644 --- a/graphics/rawtherapee/distinfo +++ b/graphics/rawtherapee/distinfo @@ -1,2 +1,2 @@ -SHA256 (rawtherapee-4.0.8.tar.xz) = b0cbeac634d927b6afc0527434b24304b9d1ab2a681915933a872cf1a27f39cd -SIZE (rawtherapee-4.0.8.tar.xz) = 40766264 +SHA256 (rawtherapee-4.0.9.tar.xz) = 4ad49b5d3aae9a178b1cfa5efca653982f0a52763ddd37f89500e8fedfb187d2 +SIZE (rawtherapee-4.0.9.tar.xz) = 40201920 diff --git a/graphics/rawtherapee/files/patch-About-Linux.cmake b/graphics/rawtherapee/files/patch-AboutThisBuild.cmake similarity index 78% rename from graphics/rawtherapee/files/patch-About-Linux.cmake rename to graphics/rawtherapee/files/patch-AboutThisBuild.cmake index 06b90d8ba3a0..0f8c407c8c0c 100644 --- a/graphics/rawtherapee/files/patch-About-Linux.cmake +++ b/graphics/rawtherapee/files/patch-AboutThisBuild.cmake @@ -1,12 +1,13 @@ ---- ./About-Linux.cmake.orig 2012-01-31 05:00:05.000000000 +0400 -+++ ./About-Linux.cmake 2012-03-29 19:28:04.000000000 +0400 -@@ -1,27 +1,8 @@ - # cmakefile executed within a makefile target +--- ./AboutThisBuild.cmake.orig 2012-06-03 19:56:20.000000000 +0400 ++++ ./AboutThisBuild.cmake 2012-08-07 15:18:18.000000000 +0400 +@@ -8,28 +8,9 @@ + find_file(HG_CMD hg) + set (SHELL "/bin/bash") + else (WIN32) # Linux +- find_file(HG_CMD hg) + set (SHELL "/bin/bash") + endif (WIN32) - # we look for the hg command in this paths by order of preference --find_file(HG_CMD hg) -- -- -# the hg command is looked for again, at build time -if (HG_CMD STREQUAL HG_CMD-NOTFOUND) - message(FATAL_ERROR "hg command not found!") @@ -14,8 +15,7 @@ - message(STATUS "hg command found: ${HG_CMD}") -endif (HG_CMD STREQUAL HG_CMD-NOTFOUND) - - set (OUT_FILE "${SRC_DIR}/AboutThisBuild.txt") --set (SHELL "/bin/bash") +-set (OUT_FILE "${SRC_DIR}/AboutThisBuild.txt") -# there should be a better way of getting the compiler + compiler version, not restrained to Gcc -execute_process(COMMAND gcc -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) -execute_process(COMMAND ${HG_CMD} -R ${SRC_DIR} branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -25,7 +25,7 @@ -if (CACHE_NAME_SUFFIX STREQUAL "") - execute_process(COMMAND ${HG_CMD} parents --template={latesttag} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE CACHE_NAME_SUFFIX OUTPUT_STRIP_TRAILING_WHITESPACE) -endif () -+set (SHELL "/bin/sh") - +- # build version.h from template configure_file (${SRC_DIR}/rtgui/version.h.in ${SRC_DIR}/rtgui/version.h) + # build AboutThisBuild.txt from template diff --git a/graphics/rawtherapee/pkg-descr b/graphics/rawtherapee/pkg-descr index 98edc6cca06d..484947fad2b8 100644 --- a/graphics/rawtherapee/pkg-descr +++ b/graphics/rawtherapee/pkg-descr @@ -42,4 +42,4 @@ Main features: * ICC based color management * Change History with bookmarks to support before/after checking -WWW: http://www.rawtherapee.com/ +WWW: http://www.rawtherapee.com/ diff --git a/graphics/rawtherapee/pkg-plist b/graphics/rawtherapee/pkg-plist index 6de07be774b5..43e8569ab52d 100644 --- a/graphics/rawtherapee/pkg-plist +++ b/graphics/rawtherapee/pkg-plist @@ -18,6 +18,9 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/dcpprofiles/Canon EOS 5D.dcp %%DATADIR%%/dcpprofiles/Canon EOS 7D.dcp %%DATADIR%%/dcpprofiles/Canon EOS D60.dcp +%%DATADIR%%/dcpprofiles/Canon EOS Digital Rebel XSi.dcp +%%DATADIR%%/dcpprofiles/Canon EOS Digital Rebel XTi.dcp +%%DATADIR%%/dcpprofiles/Canon EOS Rebel T2i.dcp %%DATADIR%%/dcpprofiles/Canon EOS-1D Mark III.dcp %%DATADIR%%/dcpprofiles/Canon PowerShot G10.dcp %%DATADIR%%/dcpprofiles/Canon PowerShot G12.dcp @@ -27,10 +30,13 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/dcpprofiles/Nikon D3100.dcp %%DATADIR%%/dcpprofiles/Nikon D3S.dcp %%DATADIR%%/dcpprofiles/Nikon D50.dcp +%%DATADIR%%/dcpprofiles/Nikon D5100.dcp %%DATADIR%%/dcpprofiles/Nikon D700.dcp +%%DATADIR%%/dcpprofiles/Nikon D7000.dcp %%DATADIR%%/dcpprofiles/Olympus E-1.dcp %%DATADIR%%/dcpprofiles/Olympus E-P2.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-FZ150.dcp +%%DATADIR%%/dcpprofiles/Panasonic DMC-FZ35.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-FZ38.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-G1.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-G3.dcp @@ -591,15 +597,15 @@ share/icons/hicolor/48x48/apps/rawtherapee.png %%DATADIR%%/profiles/BW-2.pp3 %%DATADIR%%/profiles/BW-3.pp3 %%DATADIR%%/profiles/BW-4.pp3 +%%DATADIR%%/profiles/Default-ISO-High.pp3 +%%DATADIR%%/profiles/Default-ISO-Medium.pp3 +%%DATADIR%%/profiles/Default.pp3 %%DATADIR%%/profiles/Highkey-1.pp3 %%DATADIR%%/profiles/Natural-1.pp3 %%DATADIR%%/profiles/Natural-2.pp3 +%%DATADIR%%/profiles/Neutral.pp3 %%DATADIR%%/profiles/Punchy-1.pp3 %%DATADIR%%/profiles/Punchy-2.pp3 -%%DATADIR%%/profiles/default-ISO-high.pp3 -%%DATADIR%%/profiles/default-ISO-medium.pp3 -%%DATADIR%%/profiles/default.pp3 -%%DATADIR%%/profiles/neutral.pp3 %%DATADIR%%/sounds/BatchComplete.wav %%DATADIR%%/sounds/Empty.wav %%DATADIR%%/sounds/ProcessComplete.wav