Move comment out of cmake command

.gitignore

@@ -25,3 +25,5 @@ rawtherapee-3.0-a1.tar.bz2
 /rawtherapee-5.5.tar.xz
 /rawtherapee-5.6-rc1.tar.xz
 /rawtherapee-5.6.tar.xz
+/rawtherapee-5.7.tar.xz
+/rawtherapee-5.8.tar.xz

RT_5.6_fix_appdata.patch

@@ -1,47 +0,0 @@
-From e48089daaa37ade0450b913a3f51d5dc2c50b790 Mon Sep 17 00:00:00 2001
-From: scx <scx.mail@gmail.com>
-Date: Tue, 23 Apr 2019 20:34:51 +0200
-Subject: [PATCH 1/2] AppData file: Fix releases
-
-Closes #5303
----
- com.rawtherapee.RawTherapee.appdata.xml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/com.rawtherapee.RawTherapee.appdata.xml b/com.rawtherapee.RawTherapee.appdata.xml
-index 32cfe30c7..e4fb460c2 100644
---- a/com.rawtherapee.RawTherapee.appdata.xml
-+++ b/com.rawtherapee.RawTherapee.appdata.xml
-@@ -36,8 +36,8 @@
-     <launchable type="desktop-id">rawtherapee.desktop</launchable>
-     <releases>
-         <release version="5.6" date="2019-04-20" type="stable"></release>
--        <release version="5.6-rc2" date="2019-04-17" type="development"></release>
--        <release version="5.6-rc1" date="2019-04-10" type="development"></release>
-+        <release version="5.6~rc2" date="2019-04-17" type="development"></release>
-+        <release version="5.6~rc1" date="2019-04-10" type="development"></release>
-         <release version="5.5" date="2018-12-17" type="stable"></release>
-     </releases>
-     <provides>
-
-From 01894609ce10453e420e78fa075ef10399e7f0c2 Mon Sep 17 00:00:00 2001
-From: scx <scx.mail@gmail.com>
-Date: Tue, 23 Apr 2019 20:52:14 +0200
-Subject: [PATCH 2/2] AppData file: Add OARS info
-
----
- com.rawtherapee.RawTherapee.appdata.xml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/com.rawtherapee.RawTherapee.appdata.xml b/com.rawtherapee.RawTherapee.appdata.xml
-index e4fb460c2..a53ccbf06 100644
---- a/com.rawtherapee.RawTherapee.appdata.xml
-+++ b/com.rawtherapee.RawTherapee.appdata.xml
-@@ -26,6 +26,7 @@
-         <keyword>pp3</keyword>
-         <keyword>graphics</keyword>
-     </keywords>
-+    <content_rating type="oars-1.0" />
-     <metadata_license>CC-BY-SA-4.0</metadata_license>
-     <project_license>GPL-3.0+</project_license>
-     <url type="bugtracker">https://github.com/Beep6581/RawTherapee/issues/new</url>

RT_5.8_system_klt.patch

@@ -0,0 +1,49 @@
+From 9205b506b50c941ee13c78243f51a2e15d9fe16f Mon Sep 17 00:00:00 2001
+From: Mattia Verga <mattia.verga@tiscali.it>
+Date: Sun, 24 Nov 2019 13:48:12 +0100
+Subject: [PATCH] Fix linking against system klt
+
+---
+ rtengine/CMakeLists.txt  | 6 ++++++
+ rtengine/calc_distort.cc | 4 ++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt
+index f58afde5e..711818a6d 100644
+--- a/rtengine/CMakeLists.txt
++++ b/rtengine/CMakeLists.txt
+@@ -12,6 +12,11 @@ include_directories(${EXTRA_INCDIR}
+     ${LENSFUN_INCLUDE_DIRS}
+     ${RSVG_INCLUDE_DIRS}
+ )
++if(NOT WITH_SYSTEM_KLT)
++    include_directories("${CMAKE_SOURCE_DIR}/rtengine/klt")
++else()
++    include_directories(${KLT_INCLUDE_DIRS})
++endif()
+ 
+ link_directories("${PROJECT_SOURCE_DIR}/rtexif"
+     ${EXPAT_LIBRARY_DIRS}
+@@ -184,6 +189,7 @@ target_link_libraries(rtengine rtexif
+     ${ZLIB_LIBRARIES}
+     ${LENSFUN_LIBRARIES}
+     ${RSVG_LIBRARIES}
++    ${KLT_LIBRARIES}
+ )
+ 
+ install(FILES ${CAMCONSTSFILE} DESTINATION "${DATADIR}" PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+diff --git a/rtengine/calc_distort.cc b/rtengine/calc_distort.cc
+index 7af47adb2..3a7a4a1c4 100644
+--- a/rtengine/calc_distort.cc
++++ b/rtengine/calc_distort.cc
+@@ -5,8 +5,8 @@ locations (before and after tracking) to text files and to PPM files,
+ and prints the features to the screen.
+ **********************************************************************/
+ 
+-#include "klt/pnmio.h"
+-#include "klt/klt.h"
++#include <pnmio.h>
++#include <klt.h>
+ #include <cmath>
+ #include <cstring>
+ 

rawtherapee.spec

@@ -1,20 +1,23 @@
+%global link_tcmalloc 1
+
 Name:           rawtherapee
-Version:        5.6
-Release:        2%{?dist}
+Version:        5.8
+Release:        1%{?dist}
 Summary:        Raw image processing software
 
 License:        GPLv3 and MIT and IJG
 URL:            http://www.rawtherapee.com/
-Source0:        http://rawtherapee.com/shared/source/%{name}-%{version}.tar.xz
+Source0:        https://github.com/Beep6581/RawTherapee/releases/download/%{version}/%{name}-%{version}.tar.xz
 
-# Backport patch to fix appdata validation
-# https://github.com/Beep6581/RawTherapee/issues/5303
-Patch0:         RT_5.6_fix_appdata.patch
+# Fix linking against system's KLT
+# Upstream PR https://github.com/Beep6581/RawTherapee/pull/5539
+Patch0:         RT_5.8_system_klt.patch
 
 
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc-c++
+BuildRequires:  klt-devel
 BuildRequires:  libappstream-glib
 BuildRequires:  libatomic
 
@@ -32,6 +35,9 @@ BuildRequires:  pkgconfig(libiptcdata)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(librsvg-2.0)
+%if 0%{?link_tcmalloc}
+BuildRequires:  pkgconfig(libtcmalloc)
+%endif
 BuildRequires:  pkgconfig(libtiff-4)
 BuildRequires:  pkgconfig(sigc++-2.0)
 BuildRequires:  pkgconfig(zlib)
@@ -54,16 +60,24 @@ to some common image format.
 # fix wrong line endings
 sed -i "s|\r||g" LICENSE.txt
 
+# remove bundled KLT, so we're sure to use system provided KLT
+rm -rf rtengine/klt/
+
 %build
+# do not build shared libs
+# https://github.com/Beep6581/RawTherapee/pull/5479
 %{cmake} %{?BUILD_TESTS} \
         -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -DLIBDIR=%{_libdir} \
         -DCMAKE_BUILD_TYPE=release \
-        -DBUILD_SHARED_LIBS:BOOL=ON \
+        -DBUILD_SHARED_LIBS:BOOL=OFF \
         -DAUTOMATED_BUILD_SYSTEM:BOOL=ON \
         -DCACHE_NAME_SUFFIX="" \
         -DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS" \
         -DCMAKE_C_FLAGS="$RPM_OPT_FLAGS" \
+%if 0%{?link_tcmalloc}
+        -DENABLE_TCMALLOC=ON \
+%endif
         -DWITH_SYSTEM_KLT=ON .
         
 make VERBOSE=1 %{?_smp_mflags} 
@@ -87,7 +101,6 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/com.%{na
 %{_mandir}/man1/%{name}.1.gz
 %{_bindir}/%{name}
 %{_bindir}/%{name}-cli
-%{_libdir}/*.so
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/metainfo/com.%{name}.RawTherapee.appdata.xml
@@ -95,6 +108,16 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/com.%{na
 
 
 %changelog
+* Wed Feb 05 2020 Mattia Verga <mattia.verga@protonmail.com> - 5.8-1
+- Release 5.8 stable
+- Fix linking to system's KLT lib
+- Use static libraries
+- Enable linking to tcmalloc
+
+* Wed Sep 11 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.7-1
+- Release 5.7 stable
+- Add forgotten klt-devel as BR
+
 * Thu Apr 25 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.6-2
 - Backport patch to fix appdata validation
 

sources

@@ -1 +1 @@
-SHA512 (rawtherapee-5.6.tar.xz) = 2c751c7631ea2ef65c334fa0baab16d4c3161fae66487870c476f07f1ea3604a5e28a251fd98d9688cafc088302af7aa6e28e9b27a37f916715708ed5e731f0f
+SHA512 (rawtherapee-5.8.tar.xz) = bc79586cd937dcaefc053e65faa2162de887d514e44980956d937c157c6d55c4f6e6a7a9b8f91f2d657ed2054814737b96d5d741674c1e5a961d7177433efe4e