From owner-svn-ports-all@freebsd.org Sat Jan 28 22:07:58 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 39F67CC67F8; Sat, 28 Jan 2017 22:07:58 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 083D418B2; Sat, 28 Jan 2017 22:07:57 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0SM7vOd010442; Sat, 28 Jan 2017 22:07:57 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0SM7ulf010433; Sat, 28 Jan 2017 22:07:56 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201701282207.v0SM7ulf010433@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sat, 28 Jan 2017 22:07:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r432687 - in branches/2017Q1/graphics/rawtherapee-devel: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jan 2017 22:07:58 -0000 Author: mandree Date: Sat Jan 28 22:07:56 2017 New Revision: 432687 URL: https://svnweb.freebsd.org/changeset/ports/432687 Log: MFH: r430465 r430466 r430467 r430475 r430615 r432608 r432640 Move forward to 5.0-gtk3 release. Changes: Fix compilation on FreeBSD 11+, and enable OpenMP. Use devel/openmp for libomp. Code generation improvements: On i386, use SSE2 instead of only SSE [1] when compiler optimizations are requested (which they are by default) RT code uses mostly SSE2 for SIMD). Fix i386 SSE2 crashes with GCC(*) (use clang there), and clean up a bit. (*) GCC does not get the stack properly aligned in i386 for SSE2 and causes SIGBUS on startup when trying to access an 8-byte aligned double[8] array with SIMD instructions. One workaround is -mstackrealign (which RT does on Win32), the other is to use clang - we don't get OpenMP on i386 anyhow, so clang 3.4 in 10.3 is sufficient. Drop -fexpensive-optimizations, clang does not support it, and gcc 5.4 includes it in -O2 and -O3. Note that the upstream discourages the use of 32-bit architectures for rawtherapee. Approved by: ports-secteam@ (junovitch) Added: branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtengine_dcraw.cc - copied unchanged from r430466, head/graphics/rawtherapee-devel/files/patch-rtengine_dcraw.cc branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtengine_imagedata.cc - copied unchanged from r432608, head/graphics/rawtherapee-devel/files/patch-rtengine_imagedata.cc branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtengine_opthelper.h - copied, changed from r430615, head/graphics/rawtherapee-devel/files/patch-rtengine_opthelper.h branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtgui_cachemanager.cc - copied unchanged from r432608, head/graphics/rawtherapee-devel/files/patch-rtgui_cachemanager.cc branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtgui_soundman.cc - copied unchanged from r432608, head/graphics/rawtherapee-devel/files/patch-rtgui_soundman.cc Deleted: branches/2017Q1/graphics/rawtherapee-devel/files/ReleaseInfo.cmake branches/2017Q1/graphics/rawtherapee-devel/files/patch-CMakeLists.txt branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtengine_improcfun.h branches/2017Q1/graphics/rawtherapee-devel/files/rawtherapee.in Modified: branches/2017Q1/graphics/rawtherapee-devel/Makefile branches/2017Q1/graphics/rawtherapee-devel/distinfo branches/2017Q1/graphics/rawtherapee-devel/pkg-message branches/2017Q1/graphics/rawtherapee-devel/pkg-plist Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/graphics/rawtherapee-devel/Makefile ============================================================================== --- branches/2017Q1/graphics/rawtherapee-devel/Makefile Sat Jan 28 22:00:49 2017 (r432686) +++ branches/2017Q1/graphics/rawtherapee-devel/Makefile Sat Jan 28 22:07:56 2017 (r432687) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= rawtherapee -PORTVERSION= 4.2.99.git000 +PORTVERSION= 5.0 +DISTVERSIONSUFFIX= -gtk3 PORTREVISION= 0 CATEGORIES= graphics MASTER_SITES= http://rawtherapee.com/shared/source/ @@ -13,101 +14,113 @@ COMMENT= Powerful RAW image processing a LICENSE= GPLv3 -LIB_DEPENDS= \ - libcanberra.so:audio/libcanberra \ +LIB_DEPENDS= libcanberra-gtk.so:audio/libcanberra \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libexpat.so:textproc/expat2 \ libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ - libgtkmm-3.0.so:x11-toolkits/gtkmm30 \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ libiptcdata.so:graphics/libiptcdata \ liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ libsigc-2.0.so:devel/libsigc++20 \ libtiff.so:graphics/tiff -USE_GITHUB= yes -GH_TUPLE= Beep6581:RawTherapee:70a79772 - -USES= cmake:outsource compiler:c++11-lib desktop-file-utils dos2unix gettext-runtime jpeg pkgconfig tar:xz +USES= cmake:outsource desktop-file-utils dos2unix \ + jpeg localbase:ldflags pkgconfig tar:xz DOS2UNIX_REGEX= .*\.(cc|h) -USE_GNOME= atkmm cairo cairomm glibmm pangomm gtk30 -USE_XORG+= x11 +LDFLAGS+= -Wl,--as-needed # fontconfig, freetype, gettext, libX11 +USE_GNOME= gtkmm30 USE_LDCONFIG= yes -USE_BINUTILS= 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}||}" +# The -D_GLIBCXX_USE_C99 works around stoi not being defined +# by default because the GCC headers believe FreeBSD insufficiently C99 +# compliant. +CFLAGS+= -I${LOCALBASE}/include -fPIC -D_GLIBCXX_USE_C99 -Wno-deprecated-declarations -Wno-unused-result +LDFLAGS+= -lpthread +CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}" \ -DCREDITSDIR="${DOCSDIR}" \ -DLICENCEDIR="${DOCSDIR}" \ -DDESKTOPDIR="${DESKTOPDIR}" \ -DDATADIR="${DATADIR}" \ - -DCACHE_NAME_SUFFIX="" -#-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}||}" -SUB_FILES= rawtherapee -SUB_LIST= RTDIR="${RTDIR}" + -DCACHE_NAME_SUFFIX="" \ + -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) && empty(CFLAGS:M-march*) +CMAKE_ARGS+= -DPROC_TARGET_NUMBER="1" +.endif + RTDIR= ${PREFIX}/libdata/${PORTNAME} OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPENMP NATIVE 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) NATIVE_DESC= Use -march=native for compilation (do not use for generic packages!) OPENMP_CMAKE_BOOL= OPTION_OMP -.if defined(PACKAGE_BUILDING) -CMAKE_ARGS+= -DPROC_TARGET_NUMBER="1" -.endif +OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops -msse2 +# GCC 5.4 includes -fexpensive-optimizations in -O2 already -.include +.include -.if ${ARCH} == "amd64" || ${ARCH} == "i386" -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CFLAGS+= -O3 -funroll-loops -msse -CXXFLAGS+= -O3 -funroll-loops -msse -.endif -.endif +# ------------------------------------------------------------------- +# .if ${PORT_OPTIONS:MNATIVE} CMAKE_ARGS+= -DPROC_TARGET_NUMBER="2" .endif -.if ${ARCH} == amd64 && ${COMPILER_TYPE} == clang -# Enable OpenMP support with Clang 3.7. -BUILD_DEPENDS+= clang37:devel/llvm37 -RUN_DEPENDS+= clang37:devel/llvm37 - -CPP= clang-cpp37 -CC= clang37 -CXX= clang++37 - -# FIXME: At least in 3.7.0 and 3.7.1, Clang doesn't find libomp.so -# itself. Furthermore, there may be a regression in 3.7.1 because we now -# need to explicitely link to libm.so as well. -OPENMP_FLAGS= -L${LOCALBASE}/llvm37/lib -lm -lomp +.if !empty(PORT_OPTIONS:MOPENMP) && ${ARCH} == "amd64" +LIB_DEPENDS+= libomp.so.0:devel/openmp +OPENMP_FLAGS= -lm -lomp LDFLAGS+= ${OPENMP_FLAGS} .endif +.if defined(WITH_DEBUG) +CMAKE_BUILD_TYPE= RelWithDebInfo +STRIP= +.endif + +.if ${ARCH} == i386 +USES+= compiler:c++11-lib +# FIXME: if we were to use GCC on i386, we'd need to use -mstackrealign +# or similar options, else we get SIGBUS when SSE2 is enabled due to +# improper alignment. Base clang is good enough though, i386 does not +# support OpenMP, and those seeking ultimate performance need to use +# amd64. +.else +USES+= compiler:gcc-c++11-lib +.endif + +# ------------------------------------------------------------------- + +.include + +.if ${CHOSEN_COMPILER_TYPE} == gcc +# Workaround: this needs to be late because Mk/Uses/compiler.mk tramples +# over previously set values with gcc-libc++-configure as of r432539. +# GCC 4.9 doesn't generate usable code on FreeBSD 11.0. +USE_GCC= 5+ +.endif + 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 -.ifdef(USE_GITHUB) -pre-configure: - ${CP} ${FILESDIR}/ReleaseInfo.cmake ${WRKSRC}/ -.endif +# paranoia: run rawtherapee --help to be sure it finds all its +# shared libraries (this hinges on proper RPATH setting and propagation) +post-install: + ${SETENV} LANG= LC_ALL=C LANGUAGE= DISPLAY= HOME=/dev/null ${STAGEDIR}${PREFIX}/bin/rawtherapee --help 2>&1 \ + | ${EGREP} -q "RawTherapee, version ${PKGVERSION:C/_.*//:C/,.*//}|cannot open display:" .include Modified: branches/2017Q1/graphics/rawtherapee-devel/distinfo ============================================================================== --- branches/2017Q1/graphics/rawtherapee-devel/distinfo Sat Jan 28 22:00:49 2017 (r432686) +++ branches/2017Q1/graphics/rawtherapee-devel/distinfo Sat Jan 28 22:07:56 2017 (r432687) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483122272 -SHA256 (Beep6581-RawTherapee-4.2.99.git000-70a79772_GH0.tar.gz) = da065b11ad1e48bd6cb545a7b936f2d4640290d93f456cab5b2380ef9fa51f9b -SIZE (Beep6581-RawTherapee-4.2.99.git000-70a79772_GH0.tar.gz) = 25829053 +TIMESTAMP = 1485205646 +SHA256 (rawtherapee-5.0-gtk3.tar.xz) = 25c6bb738535d1efa905bd21fb732bdea352d589d9740a730ec409a49e7eacd8 +SIZE (rawtherapee-5.0-gtk3.tar.xz) = 10442940 Copied: branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtengine_dcraw.cc (from r430466, head/graphics/rawtherapee-devel/files/patch-rtengine_dcraw.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtengine_dcraw.cc Sat Jan 28 22:07:56 2017 (r432687, copy of r430466, head/graphics/rawtherapee-devel/files/patch-rtengine_dcraw.cc) @@ -0,0 +1,11 @@ +--- rtengine/dcraw.cc.orig 2016-12-30 15:28:53 UTC ++++ rtengine/dcraw.cc +@@ -2011,7 +2011,7 @@ void CLASS hasselblad_correct() + {bhu-1,0},{bhu-1,bwu/2},{bhu-1,bwu-1}}; + for (col = 0; col < bw; col++) { + for (i = 0; i < 9; i++) { +- ushort dist = (ushort)sqrt(abs(corners[i][0] - row) * abs(corners[i][0] - row) + abs(corners[i][1] - col) * abs(corners[i][1] - col)); ++ ushort dist = (ushort)sqrt(std::fabs(corners[i][0] - row) * std::fabs(corners[i][0] - row) + std::fabs(corners[i][1] - col) * std::fabs(corners[i][1] - col)); + ushort weight = dist > maxdist ? 0 : maxdist - dist; + corners_weight[9*(row*bw+col)+i] = weight; + } Copied: branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtengine_imagedata.cc (from r432608, head/graphics/rawtherapee-devel/files/patch-rtengine_imagedata.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtengine_imagedata.cc Sat Jan 28 22:07:56 2017 (r432687, copy of r432608, head/graphics/rawtherapee-devel/files/patch-rtengine_imagedata.cc) @@ -0,0 +1,11 @@ +--- rtengine/imagedata.cc.orig 2017-01-26 22:12:23 UTC ++++ rtengine/imagedata.cc +@@ -444,7 +444,7 @@ void ImageData::extractInfo () + if (baseIsoTag) { + std::string isoData = baseIsoTag->valueToString(); + if (isoData.size() > 1) { +- iso_speed = stoi(isoData); ++ iso_speed = std::stoi(isoData); + } + } + } Copied and modified: branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtengine_opthelper.h (from r430615, head/graphics/rawtherapee-devel/files/patch-rtengine_opthelper.h) ============================================================================== --- head/graphics/rawtherapee-devel/files/patch-rtengine_opthelper.h Thu Jan 5 04:23:04 2017 (r430615, copy source) +++ branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtengine_opthelper.h Sat Jan 28 22:07:56 2017 (r432687) @@ -1,4 +1,4 @@ ---- rtengine/opthelper.h.orig 2017-01-05 02:25:57 UTC +--- rtengine/opthelper.h.orig 2017-01-26 22:12:23 UTC +++ rtengine/opthelper.h @@ -69,7 +69,7 @@ #define ALIGNED64 Copied: branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtgui_cachemanager.cc (from r432608, head/graphics/rawtherapee-devel/files/patch-rtgui_cachemanager.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtgui_cachemanager.cc Sat Jan 28 22:07:56 2017 (r432687, copy of r432608, head/graphics/rawtherapee-devel/files/patch-rtgui_cachemanager.cc) @@ -0,0 +1,11 @@ +--- rtgui/cachemanager.cc.orig 2017-01-26 22:12:22 UTC ++++ rtgui/cachemanager.cc +@@ -36,7 +36,7 @@ namespace + { + + constexpr auto cacheDirMode = 511; +-constexpr auto cacheDirs = { "profiles", "images", "aehistograms", "embprofiles", "data" }; ++constexpr const char *cacheDirs[] = { "profiles", "images", "aehistograms", "embprofiles", "data" }; + + } + Copied: branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtgui_soundman.cc (from r432608, head/graphics/rawtherapee-devel/files/patch-rtgui_soundman.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/graphics/rawtherapee-devel/files/patch-rtgui_soundman.cc Sat Jan 28 22:07:56 2017 (r432687, copy of r432608, head/graphics/rawtherapee-devel/files/patch-rtgui_soundman.cc) @@ -0,0 +1,22 @@ +--- rtgui/soundman.cc.orig 2017-01-26 22:12:22 UTC ++++ rtgui/soundman.cc +@@ -24,9 +24,7 @@ + #ifdef WIN32 + #include + #include +-#endif +- +-#ifdef __linux__ ++#elif !defined(__APPLE__) + #include + #endif + +@@ -67,7 +65,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 + } Modified: branches/2017Q1/graphics/rawtherapee-devel/pkg-message ============================================================================== --- branches/2017Q1/graphics/rawtherapee-devel/pkg-message Sat Jan 28 22:00:49 2017 (r432686) +++ branches/2017Q1/graphics/rawtherapee-devel/pkg-message Sat Jan 28 22:07:56 2017 (r432687) @@ -10,4 +10,3 @@ remove older cache directories. Also, after configurations have been moved to the new version's directory, older $HOME/.config/RawTherapee* directories may be removed. ====================================================================== - Modified: branches/2017Q1/graphics/rawtherapee-devel/pkg-plist ============================================================================== --- branches/2017Q1/graphics/rawtherapee-devel/pkg-plist Sat Jan 28 22:00:49 2017 (r432686) +++ branches/2017Q1/graphics/rawtherapee-devel/pkg-plist Sat Jan 28 22:07:56 2017 (r432687) @@ -18,10 +18,12 @@ share/icons/hicolor/48x48/apps/rawtherap %%DATADIR%%/dcpprofiles/Canon EOS 400D.dcp %%DATADIR%%/dcpprofiles/Canon EOS 40D.dcp %%DATADIR%%/dcpprofiles/Canon EOS 450D.dcp +%%DATADIR%%/dcpprofiles/Canon EOS 50D.dcp %%DATADIR%%/dcpprofiles/Canon EOS 550D.dcp %%DATADIR%%/dcpprofiles/Canon EOS 5D Mark III.dcp %%DATADIR%%/dcpprofiles/Canon EOS 5D.dcp %%DATADIR%%/dcpprofiles/Canon EOS 6D.dcp +%%DATADIR%%/dcpprofiles/Canon EOS 7D Mark II.dcp %%DATADIR%%/dcpprofiles/Canon EOS 7D.dcp %%DATADIR%%/dcpprofiles/Canon EOS D60.dcp %%DATADIR%%/dcpprofiles/Canon EOS Digital Rebel XSi.dcp @@ -37,9 +39,10 @@ share/icons/hicolor/48x48/apps/rawtherap %%DATADIR%%/dcpprofiles/Fujifilm FinePix S9500.dcp %%DATADIR%%/dcpprofiles/Fujifilm X-E1.dcp %%DATADIR%%/dcpprofiles/Fujifilm X-E2.dcp -%%DATADIR%%/dcpprofiles/Fujifilm X-T1.dcp +%%DATADIR%%/dcpprofiles/FUJIFILM X-Pro2.dcp +%%DATADIR%%/dcpprofiles/FUJIFILM X-T1.dcp %%DATADIR%%/dcpprofiles/Fujifilm X-T10.dcp -%%DATADIR%%/dcpprofiles/Fujifilm X100T.dcp +%%DATADIR%%/dcpprofiles/FUJIFILM X100T.dcp %%DATADIR%%/dcpprofiles/Leaf Aptus 75.dcp %%DATADIR%%/dcpprofiles/Nikon D200.dcp %%DATADIR%%/dcpprofiles/Nikon D300.dcp @@ -48,14 +51,17 @@ share/icons/hicolor/48x48/apps/rawtherap %%DATADIR%%/dcpprofiles/Nikon D3S.dcp %%DATADIR%%/dcpprofiles/Nikon D50.dcp %%DATADIR%%/dcpprofiles/Nikon D5100.dcp +%%DATADIR%%/dcpprofiles/NIKON D600.dcp %%DATADIR%%/dcpprofiles/Nikon D700.dcp %%DATADIR%%/dcpprofiles/Nikon D7000.dcp -%%DATADIR%%/dcpprofiles/Nikon D7200.dcp -%%DATADIR%%/dcpprofiles/Nikon D750.dcp +%%DATADIR%%/dcpprofiles/NIKON D7200.dcp +%%DATADIR%%/dcpprofiles/NIKON D750.dcp %%DATADIR%%/dcpprofiles/Nikon D800.dcp +%%DATADIR%%/dcpprofiles/NIKON D810.dcp %%DATADIR%%/dcpprofiles/Olympus E-1.dcp %%DATADIR%%/dcpprofiles/Olympus E-510.dcp %%DATADIR%%/dcpprofiles/Olympus E-520.dcp +%%DATADIR%%/dcpprofiles/OLYMPUS E-M10.dcp %%DATADIR%%/dcpprofiles/Olympus E-M5.dcp %%DATADIR%%/dcpprofiles/Olympus E-P2.dcp %%DATADIR%%/dcpprofiles/Olympus XZ-1.dcp @@ -67,18 +73,21 @@ share/icons/hicolor/48x48/apps/rawtherap %%DATADIR%%/dcpprofiles/Panasonic DMC-G5.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-GH1.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-GH2.dcp -%%DATADIR%%/dcpprofiles/Pentax K-5 II.dcp -%%DATADIR%%/dcpprofiles/Pentax K-5.dcp +%%DATADIR%%/dcpprofiles/PENTAX K-5 II.dcp +%%DATADIR%%/dcpprofiles/PENTAX K-5.dcp %%DATADIR%%/dcpprofiles/Pentax K-r.dcp -%%DATADIR%%/dcpprofiles/Pentax K10D.dcp +%%DATADIR%%/dcpprofiles/PENTAX K10D.dcp %%DATADIR%%/dcpprofiles/Pentax K200D.dcp -%%DATADIR%%/dcpprofiles/Ricoh Pentax K-3.dcp +%%DATADIR%%/dcpprofiles/RICOH PENTAX K-1.dcp +%%DATADIR%%/dcpprofiles/RICOH PENTAX K-3.dcp %%DATADIR%%/dcpprofiles/Sony DSLR-A700.dcp %%DATADIR%%/dcpprofiles/Sony DSLR-A900.dcp -%%DATADIR%%/dcpprofiles/Sony ILCE-6000.dcp -%%DATADIR%%/dcpprofiles/Sony ILCE-7M2.dcp +%%DATADIR%%/dcpprofiles/SONY ILCE-6000.dcp +%%DATADIR%%/dcpprofiles/SONY ILCE-7M2.dcp %%DATADIR%%/dcpprofiles/Sony NEX-5N.dcp %%DATADIR%%/dcpprofiles/Sony SLT-A55V.dcp +%%DATADIR%%/dcpprofiles/SONY SLT-A99V.dcp +%%DATADIR%%/dcpprofiles/YI TECHNOLOGY M1.dcp %%DATADIR%%/iccprofiles/input/Canon EOS 20D.icc %%DATADIR%%/iccprofiles/input/Canon EOS 40D.icc %%DATADIR%%/iccprofiles/input/Canon EOS 450D.icc @@ -867,28 +876,4 @@ share/icons/hicolor/48x48/apps/rawtherap %%DATADIR%%/themes/RawTherapee-GTK3-_19.css %%DATADIR%%/themes/TooWaBlue-Dark-GTK3-20_.css %%DATADIR%%/themes/TooWaBlue-GTK3-20_.css -%%DATADIR%%/themes/images/svg/twb/checkbox-checked-disabled.svg -%%DATADIR%%/themes/images/svg/twb/checkbox-checked.svg -%%DATADIR%%/themes/images/svg/twb/checkbox-inconsistent-disabled.svg -%%DATADIR%%/themes/images/svg/twb/checkbox-inconsistent.svg -%%DATADIR%%/themes/images/svg/twb/checkbox-unchecked-disabled.svg -%%DATADIR%%/themes/images/svg/twb/checkbox-unchecked.svg -%%DATADIR%%/themes/images/svg/twb/radio-checked-disabled.svg -%%DATADIR%%/themes/images/svg/twb/radio-checked.svg -%%DATADIR%%/themes/images/svg/twb/radio-inconsistent-disabled.svg -%%DATADIR%%/themes/images/svg/twb/radio-inconsistent.svg -%%DATADIR%%/themes/images/svg/twb/radio-unchecked-disabled.svg -%%DATADIR%%/themes/images/svg/twb/radio-unchecked.svg -%%DATADIR%%/themes/images/twb/checkbox-checked-disabled.png -%%DATADIR%%/themes/images/twb/checkbox-checked.png -%%DATADIR%%/themes/images/twb/checkbox-inconsistent-disabled.png -%%DATADIR%%/themes/images/twb/checkbox-inconsistent.png -%%DATADIR%%/themes/images/twb/checkbox-unchecked-disabled.png -%%DATADIR%%/themes/images/twb/checkbox-unchecked.png -%%DATADIR%%/themes/images/twb/radio-checked-disabled.png -%%DATADIR%%/themes/images/twb/radio-checked.png -%%DATADIR%%/themes/images/twb/radio-inconsistent-disabled.png -%%DATADIR%%/themes/images/twb/radio-inconsistent.png -%%DATADIR%%/themes/images/twb/radio-unchecked-disabled.png -%%DATADIR%%/themes/images/twb/radio-unchecked.png %%DATADIR%%/themes/system.iconset