From b7435e173c0629c20d2a1fbe0f6211c22d82a2d2 Mon Sep 17 00:00:00 2001 From: Thibault North Date: Mar 24 2010 05:45:57 +0000 Subject: New upstream repository (Rawtherapee-fork) providing tons of useful patches --- diff --git a/.cvsignore b/.cvsignore index 649d1de..8570a1e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rawtherapee-3.0-a1.tar.bz2 +rawtherapee-3.0-a1-fork.tar.bz2 diff --git a/import.log b/import.log index 1340bc9..7a759cf 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ rawtherapee-3_0-0_10_a1_fc12:F-13:rawtherapee-3.0-0.10.a1.fc12.src.rpm:1269088707 +rawtherapee-3_0-0_14_a1_fc12:F-13:rawtherapee-3.0-0.14.a1.fc12.src.rpm:1269409518 diff --git a/rawtherapee-lcms.patch b/rawtherapee-lcms.patch deleted file mode 100644 index c7ac6d3..0000000 --- a/rawtherapee-lcms.patch +++ /dev/null @@ -1,320 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 937aa51..ed21032 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,3 +1,6 @@ -+cmake_minimum_required(VERSION 2.6) -+ -+option (WITH_RAWZOR "Build with Rawzor support" ON) - - add_subdirectory (rtexif) - add_subdirectory (rtengine) -diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt -index f07fd96..410dcf3 100755 ---- a/rtengine/CMakeLists.txt -+++ b/rtengine/CMakeLists.txt -@@ -1,29 +1,37 @@ --cmake_minimum_required(VERSION 2.6) - find_package(PkgConfig) - --pkg_check_modules (GLIB2 glib-2.0>=2.16) --pkg_check_modules (GLIBMM glibmm-2.4>=2.16) --pkg_check_modules (SIGC sigc++-2.0) -+pkg_check_modules (GLIB2 REQUIRED glib-2.0>=2.16) -+pkg_check_modules (GTHREAD REQUIRED gthread-2.0>=2.16) -+pkg_check_modules (GOBJECT REQUIRED gobject-2.0>=2.16) -+pkg_check_modules (GLIBMM REQUIRED glibmm-2.4>=2.16) -+pkg_check_modules (SIGC REQUIRED sigc++-2.0) - - IF (WIN32) -- SET (EXTRA_LIBDIR "../lib; ../rawzor_win") -- SET (EXTRA_INCDIR "../winclude; ../rawzor_win") -- SET (EXTRA_LIB "ws2_32 ../lib/libiptcdata.a ../lib/libjpeg.a ../lib/libpng.a ../lib/libtiff.a ../lib/libz.a ../rawzor_win/rwz_sdk_s.a") -+ SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../lib; ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win") -+ SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../winclude; ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win") -+ SET (EXTRA_LIB "ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libiptcdata.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libjpeg.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libpng.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libtiff.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libz.a") -+ if (WITH_RAWZOR) - ADD_DEFINITIONS (-DRAWZOR_SUPPORT) -+ SET (EXTRA_LIB "${EXTRA_LIB} ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win/rwz_sdk_s.a") -+ endif (WITH_RAWZOR) - ELSE (WIN32) -+ if (WITH_RAWZOR) - IF (CMAKE_SIZEOF_VOID_P EQUAL 4) -- SET (EXTRA_INCDIR "../rawzor_lin32") -- SET (EXTRA_LIBDIR "../rawzor_lin32") -+ SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") -+ SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") - ELSEIF (CMAKE_SIZEOF_VOID_P EQUAL 8) -- SET (EXTRA_INCDIR "../rawzor_lin64") -- SET (EXTRA_LIBDIR "../rawzor_lin64") -+ SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") -+ SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") - ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4) -- SET (EXTRA_LIB "iptcdata -lrwz_sdk") -+ SET (EXTRA_LIB "-lrwz_sdk") - ADD_DEFINITIONS (-DRAWZOR_SUPPORT) -+ endif (WITH_RAWZOR) -+ pkg_check_modules (IPTCDATA REQUIRED libiptcdata) -+ pkg_check_modules (LCMS REQUIRED lcms) - ENDIF (WIN32) - --include_directories (. ../rtexif ${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS}) --link_directories (../rtexif ${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS}) -+include_directories (${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_INCDIR} ${GTHREAD_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} ${IPTCDATA_INCLUDE_DIRS} ${LCMS_INCLUDE_DIRS}) -+link_directories (${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_LIBDIR} ${GTHREAD_LIBRARY_DIRS} ${GOBJECT_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS} ${IPTCDATA_LIBRARY_DIRS} ${LCMS_LIBRARY_DIRS}) - - add_library (rtengine SHARED colortemp.cc curves.cc dcraw.cc gauss.cc iccstore.cc - image8.cc image16.cc imagedata.cc imageio.cc improcfun.cc init.cc dcrop.cc -@@ -36,14 +44,9 @@ set_target_properties (rtengine PROPERTIES COMPILE_FLAGS "-O3 -ffast-math -fexpe - #add_executable (rtcmd rtetest.cc) - #add_executable (ppmap pparamsmap.cc) - --target_link_libraries (rtengine rtexif lcms ${EXTRA_LIB} gthread-2.0 gobject-2.0 ${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES}) -+target_link_libraries (rtengine rtexif ${EXTRA_LIB} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES} ${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${LCMS_LIBRARIES} ${IPTCDATA_LIBRARIES}) - #target_link_libraries (rtcmd rtengine) - #target_link_libraries (ppmap rtengine) - --IF (WIN32) --install (FILES librtengine.dll DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release -- PERMISSIONS OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ ) --ELSE (WIN32) --install (FILES librtengine.so DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release -+install (TARGETS rtengine DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ ) --ENDIF (WIN32) -diff --git a/rtengine/bilateral2.h b/rtengine/bilateral2.h -index 4aea99d..1ba7d0e 100755 ---- a/rtengine/bilateral2.h -+++ b/rtengine/bilateral2.h -@@ -25,9 +25,7 @@ - #include - #include - #include -- --#define MAX(a,b) ((a)<(b)?(b):(a)) --#define MIN(a,b) ((a)>(b)?(b):(a)) -+#include - - #define ELEM(a,b) (src[i-a][j-b] * ec[src[i-a][j-b]-src[i][j]+0x10000]) - #define SULY(a,b) (ec[src[i-a][j-b]-src[i][j]+0x10000]) -diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc -index dc57777..3057493 100755 ---- a/rtengine/dcraw.cc -+++ b/rtengine/dcraw.cc -@@ -25,6 +25,7 @@ - /*RT*/int ciff_base, ciff_len, exif_base, pre_filters; - /*RT*/#undef MAX - /*RT*/#undef MIN -+/*RT*/#undef ABS - /*RT*/#define NO_LCMS - /*RT*/#define NO_JPEG - /*RT*/#define LOCALTIME -diff --git a/rtengine/hlmultipliers.cc b/rtengine/hlmultipliers.cc -index ea44742..eafa43d 100755 ---- a/rtengine/hlmultipliers.cc -+++ b/rtengine/hlmultipliers.cc -@@ -20,8 +20,6 @@ - #include - #include - --#define MAX(a,b) ((a)<(b)?(b):(a)) -- - #define MAXVAL 0xffff - #define CLIP(a) ((a)>0?((a) - #include - #include -+#ifdef RAWZOR_SUPPORT - #include -+#endif - - using namespace rtengine; - -diff --git a/rtengine/myfile.cc b/rtengine/myfile.cc -index e1d2ac7..5202870 100755 ---- a/rtengine/myfile.cc -+++ b/rtengine/myfile.cc -@@ -19,7 +19,9 @@ - #include - #include - #include -+#ifdef RAWZOR_SUPPORT - #include -+#endif - - IMFILE* fopen (const char* fname) { - -diff --git a/rtgui/CMakeLists.txt b/rtgui/CMakeLists.txt -index 1245c45..31ddd6f 100755 ---- a/rtgui/CMakeLists.txt -+++ b/rtgui/CMakeLists.txt -@@ -1,42 +1,42 @@ - - find_package(PkgConfig) - --pkg_check_modules (GLIB2 glib-2.0>=2.16) --pkg_check_modules (GLIBMM glibmm-2.4>=2.16) --pkg_check_modules (GTK gtk+-2.0>=2.12) --pkg_check_modules (GTKMM gtkmm-2.4>=2.12) --pkg_check_modules (GIO gio-2.0>=2.16) --pkg_check_modules (GIOMM giomm-2.4>=2.12) -+pkg_check_modules (GLIB2 REQUIRED glib-2.0>=2.16) -+pkg_check_modules (GLIBMM REQUIRED glibmm-2.4>=2.16) -+pkg_check_modules (GTK REQUIRED gtk+-2.0>=2.12) -+pkg_check_modules (GTKMM REQUIRED gtkmm-2.4>=2.12) -+pkg_check_modules (GIO REQUIRED gio-2.0>=2.16) -+pkg_check_modules (GIOMM REQUIRED giomm-2.4>=2.12) - --SET (BASESOURCEFILES -+SET (BASESOURCEFILES - batchtoolpanelcoord.cc paramsedited.cc cropwindow.cc previewhandler.cc previewwindow.cc navigator.cc indclippedpanel.cc filterpanel.cc - cursormanager.cc rtwindow.cc renamedlg.cc recentbrowser.cc placesbrowser.cc filepanel.cc editorpanel.cc batchqueuepanel.cc - ilabel.cc thumbbrowserbase.cc adjuster.cc filebrowserentry.cc filebrowser.cc filethumbnailbuttonset.cc -- cachemanager.cc cacheimagedata.cc -+ cachemanager.cc cacheimagedata.cc - clipboard.cc thumbimageupdater.cc bqentryupdater.cc - coarsepanel.cc cacorrection.cc colorshift.cc hlrec.cc chmixer.cc - colorboost.cc resize.cc icmpanel.cc crop.cc shadowshighlights.cc -- colordenoise.cc -- exifpanel.cc -- sharpening.cc -+ colordenoise.cc -+ exifpanel.cc -+ sharpening.cc - whitebalance.cc vignetting.cc rotate.cc distortion.cc -- crophandler.cc curveeditor.cc dirbrowser.cc -+ crophandler.cc curveeditor.cc dirbrowser.cc - filecatalog.cc - histogrampanel.cc history.cc imagearea.cc - imageareapanel.cc iptcpanel.cc lcurve.cc lumadenoise.cc main.cc - multilangmgr.cc mycurve.cc options.cc - preferences.cc profilepanel.cc saveasdlg.cc - saveformatpanel.cc splash.cc -- thumbnail.cc tonecurve.cc toolbar.cc -+ thumbnail.cc tonecurve.cc toolbar.cc - guiutils.cc zoompanel.cc toolpanelcoord.cc - thumbbrowserentrybase.cc batchqueueentry.cc -- batchqueue.cc lwbutton.cc lwbuttonset.cc -+ batchqueue.cc lwbutton.cc lwbuttonset.cc - batchqueuebuttonset.cc browserfilter.cc exiffiltersettings.cc - profilestore.cc partialpastedlg.cc) - - IF (WIN32) -- SET (EXTRA_LIBDIR "../lib") -- SET (EXTRA_INCDIR "../winclude") -+ SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../lib") -+ SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../winclude") - SET (EXTRA_SRC "windirmonitor.cc myicon.o") - SET (EXTRA_LIB "ws2_32") - -@@ -48,53 +48,79 @@ link_directories (. ../rtexif ${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIB - - add_executable (rth windirmonitor.cc myicon.o ${BASESOURCEFILES}) - -+ set(IPTCDATA_LIBRARIES iptcdata) -+ set(LCMS_LIBRARIES liblcms.a) -+ set(GTHREAD_LIBRARIES gthread-2.0) -+ set(GOBJECTLIBRARIES gobject-2.0) -+ set(JPEG_LIBRARIES libjpeg.a) -+ set(ZLIB_LIBRARIES libz.a) -+ set(TIFF_LIBRARIES libtiff.a) -+ set(PNG_LIBRARIES libpng.a) -+ - ELSE (WIN32) -+ pkg_check_modules (IPTCDATA REQUIRED libiptcdata) -+ pkg_check_modules (LCMS REQUIRED lcms) -+ pkg_check_modules (PNG REQUIRED libpng) -+ pkg_check_modules (GTHREAD REQUIRED gthread-2.0>=2.16) -+ pkg_check_modules (GOBJECT REQUIRED gobject-2.0>=2.16) -+ find_library(JPEG_LIBRARIES NAMES jpeg) -+ if (NOT JPEG_LIBRARIES) -+ message(SEND_ERROR "libjpeg was not found!") -+ endif (NOT JPEG_LIBRARIES) -+ find_library(TIFF_LIBRARIES NAMES tiff) -+ if (NOT TIFF_LIBRARIES) -+ message(SEND_ERROR "libtiff was not found!") -+ endif (NOT TIFF_LIBRARIES) -+ find_library(ZLIB_LIBRARIES NAMES z) -+ if (NOT ZLIB_LIBRARIES) -+ message(SEND_ERROR "libz was not found!") -+ endif (NOT ZLIB_LIBRARIES) -+ if (WITH_RAWZOR) - IF (CMAKE_SIZEOF_VOID_P EQUAL 4) -- SET (EXTRA_INCDIR "../rawzor_lin32") -- SET (EXTRA_LIBDIR "../rawzor_lin32") -+ SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") -+ SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") - ELSEIF (CMAKE_SIZEOF_VOID_P EQUAL 8) -- SET (EXTRA_INCDIR "../rawzor_lin64") -- SET (EXTRA_LIBDIR "../rawzor_lin64") -+ SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") -+ SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") - ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4) -+ endif (WITH_RAWZOR) - --include_directories (/usr/local/lib ../rtengine . ../rtexif ${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} -- ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} ${GIOMM_INCLUDE_DIRS}) --link_directories (. ../rtexif ${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS} -- ${GTK_LIBRARY_DIRS} ${GTKMM_LIBRARY_DIRS} ${GIO_LIBRARY_DIRS} ${GIOMM_LIBRARY_DIRS}) -+include_directories (/usr/local/lib ${CMAKE_CURRENT_SOURCE_DIR}/../rtengine . ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} -+ ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} ${GIOMM_INCLUDE_DIRS} ${IPTCDATA_INCLUDE_DIRS} ${LCMS_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS} ) -+link_directories (. ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_LIBDIR} ${GLIB2_LIBRARY_DIRS} ${GLIBMM_LIBRARY_DIRS} -+ ${GTK_LIBRARY_DIRS} ${GTKMM_LIBRARY_DIRS} ${GIO_LIBRARY_DIRS} ${GIOMM_LIBRARY_DIRS} ${IPTCDATA_LIBRARY_DIRS} ${LCMS_LIBRARY_DIRS} ${GTHREAD_LIBRARY_DIRS} ${GOBJECT_LIBRARY_DIRS}) - - add_executable (rth ${BASESOURCEFILES}) - ENDIF (WIN32) - - --set_target_properties (rth PROPERTIES COMPILE_FLAGS "-O3") --target_link_libraries (rth rtengine liblcms.a iptcdata libjpeg.a libpng.a libz.a libtiff.a ${EXTRA_LIB} gthread-2.0 gobject-2.0 -- ${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${GTK_LIBRARIES} ${GTKMM_LIBRARIES} ${GIO_LIBRARIES} ${GIOMM_LIBRARIES}) -+set_target_properties (rth PROPERTIES COMPILE_FLAGS "-O3" OUTPUT_NAME rt) -+target_link_libraries (rth rtengine ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${TIFF_LIBRARIES} ${EXTRA_LIB} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES} -+ ${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${GTK_LIBRARIES} ${GTKMM_LIBRARIES} ${GIO_LIBRARIES} ${GIOMM_LIBRARIES} ${LCMS_LIBRARIES} ${IPTCDATA_LIBRARIES}) - - IF (WIN32) -- install (FILES rth.exe DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release -- PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ -- RENAME rt.exe) -- install (FILES ../rawzor_win/rwz_sdk_s.dll DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release -+ install (TARGETS rth DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release -+ PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) -+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win/rwz_sdk_s.dll DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) -- install (FILES ../options.win DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release -+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../options.win DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ - RENAME options) - ELSE (WIN32) -- install (FILES rth DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release -- PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ -- RENAME rt) -- install (FILES ../options.lin DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release -+ install (TARGETS rth DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release -+ PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) -+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../options.lin DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ - RENAME options) -- install (FILES ../rtstart DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release -+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../rtstart DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) - IF (CMAKE_SIZEOF_VOID_P EQUAL 4) -- install (FILES ../rawzor_lin32/librwz_sdk.so DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release -- PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ -+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32/librwz_sdk.so DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release -+ PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ - RENAME rwz_sdk.so) - ELSEIF (CMAKE_SIZEOF_VOID_P EQUAL 8) -- install (FILES ../rawzor_lin64/librwz_sdk.so DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release -- PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ -+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64/librwz_sdk.so DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release -+ PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ - RENAME rwz_sdk.so) - ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4) - ENDIF (WIN32) diff --git a/rawtherapee-rawzor.patch b/rawtherapee-rawzor.patch deleted file mode 100644 index 7a81832..0000000 --- a/rawtherapee-rawzor.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/rtgui/CMakeLists.txt 2010-02-25 09:18:09.437449211 +0100 -+++ b/rtgui/CMakeLists.txt 2010-02-25 09:17:58.119708149 +0100 -@@ -114,6 +114,7 @@ - RENAME options) - install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../rtstart DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release - PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) -+ if (WITH_RAWZOR) - IF (CMAKE_SIZEOF_VOID_P EQUAL 4) - install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32/librwz_sdk.so DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ -@@ -123,5 +124,6 @@ - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ - RENAME rwz_sdk.so) - ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4) -+ endif (WITH_RAWZOR) - ENDIF (WIN32) - diff --git a/rawtherapee.desktop b/rawtherapee.desktop index aa584b0..61e3cbc 100644 --- a/rawtherapee.desktop +++ b/rawtherapee.desktop @@ -4,7 +4,7 @@ Categories=Graphics;Photography;GTK; Name=Rawtherapee GenericName=Raw image converter Comment=Read, modify and export digital-camera raw files -Exec=rtstart %F +Exec=rt %F StartupNotify=true Icon=rawtherapee MimeType=image/x-dcraw; diff --git a/rawtherapee.spec b/rawtherapee.spec index 0d93129..40ad70e 100644 --- a/rawtherapee.spec +++ b/rawtherapee.spec @@ -1,19 +1,20 @@ -# Tarfile created using svn -# svn checkout http://rawtherapee.googlecode.com/svn/tags/release-%{version}-%{prerelease}/ %{name} -# cd %{name} -# svn export . %{name}-%{version} +# Tarfile created using git +# git clone git://github.com/thebiguno/RawTherapee-Fork.git %{name}-%{version} +# # cd %{name}-%{version} +# rm -rf .git* +# rm -rf doc/ # rm -rf rawzor_* -# rm -f release/themes/* tools/createicon.exe +# rm -f rtdata/themes/* tools/createicon.exe +# mv rtdata/languages/english-us . && rm -f rtdata/languages/* && mv english-us rtdata/languages/ # rm -f lib/*.a -# mv release/languages/english-us release/ && rm -f release/languages/* && mv release/english-us release/languages/ -# tar -cjvf ~/%{name}-%{version}-%{prerelease}.tar.bz2 ../%{name}-%{version} +# tar -cjvf ~/%{name}-%{version}-%{prerelease}-fork.tar.bz2 ../%{name}-%{version} %global prerelease a1 -%global tarfile %{name}-%{version}-%{prerelease}.tar.bz2 +%global tarfile %{name}-%{version}-%{prerelease}-fork.tar.bz2 Name: rawtherapee Version: 3.0 -Release: 0.11.%{prerelease}%{?dist} +Release: 0.14.%{prerelease}%{?dist} Summary: Raw image processing software Group: Applications/Multimedia @@ -21,11 +22,6 @@ License: GPLv3 and MIT and IJG URL: http://www.rawtherapee.com/ Source0: %{tarfile} Source1: %{name}.desktop -# Check for lcms and various fixes to the makefile -# Source: http://rawtherapee.com/forum/viewtopic.php?t=1701 -Patch0: rawtherapee-lcms.patch -# Removal of Rawzor dependency for the build, since rawzor is proprietary -Patch1: rawtherapee-rawzor.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,7 +30,6 @@ BuildRequires: gtk2-devel >= 2.12 BuildRequires: gtkmm24-devel >= 2.16 BuildRequires: lcms-devel libjpeg-devel libtiff-devel BuildRequires: libpng-devel libiptcdata-devel desktop-file-utils -#Requires: argyllcms, lcms Requires: hicolor-icon-theme @@ -46,38 +41,17 @@ to some common image format. %prep %setup -q -%patch0 -p1 -%patch1 -p1 - -# adjust header locations -sed -i "s|#include |#include \\n#include |" rtgui/main.cc -sed -i "s#argv0_ = argv\[0\];#argv0_ = getenv(\"RT_DATA\");#" rtgui/main.cc # we don't want rawzor support sed -i 's#\"Build with Rawzor support\" ON#\"Build with Rawzor support\" OFF#' CMakeLists.txt -sed -i 's#-O3#${CMAKE_CXX_FLAGS}#g' rtexif/CMakeLists.txt -sed -i 's#-O3#${CMAKE_CXX_FLAGS}#' rtgui/CMakeLists.txt -sed -i 's#-O3#${CMAKE_CXX_FLAGS}#' rtengine/CMakeLists.txt - -# Avoid unexisting optimizations for these arch -%ifarch ppc ppc64 -sed -i 's#-msse##' rtengine/CMakeLists.txt -%endif - -# create shared lib for rtexif -sed -i "s#add_library (rtexif#add_library (rtexif SHARED#" rtexif/CMakeLists.txt -sed -i "s#export LD_LIBRARY_PATH=\`dirname \"\$0\"\`#export LD_LIBRARY_PATH=%{_libdir}/%{name}\\nexport RT_DATA=%{_datadir}/%{name}/#" rtstart -sed -i "s#\`dirname \"\$0\"\`/rt#\`dirname \"\$0\"\`/rt#" rtstart - -# set fitting permissions -find release/languages/ -type f -perm -u=x -exec chmod 0644 {} ';' -find release/themes/ -type f -perm -u=x -exec chmod 0644 {} ';' -find release/profiles/ -type f -perm -u=x -exec chmod 0644 {} ';' -find release/images/ -type f -perm -u=x -exec chmod 0644 {} ';' -find . -name *.cc -type f -perm -u=x -exec chmod 0644 {} ';' -find . -name *.c -type f -perm -u=x -exec chmod 0644 {} ';' -find . -name *.h -type f -perm -u=x -exec chmod 0644 {} ';' +# Remove unlicenced themes (keep default) and languages (keep english) +sed -ri "s/^\s+.languages\/.*$//g" rtdata/CMakeLists.txt +sed -ri "s/\/catala/\/english-us\)/" rtdata/CMakeLists.txt +sed -ri "s/^\s+themes\/.*//g" rtdata/CMakeLists.txt +sed -ri "s/(set \(THEMEFILES.+?)//" rtdata/CMakeLists.txt +# Allow compiling without theme +sed -ri "s/(install.+?themes\))//" rtdata/CMakeLists.txt # fix wrong line endings sed -i "s|\r||g" authors compile @@ -93,7 +67,7 @@ make VERBOSE=1 %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install +make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \ %{SOURCE1} @@ -102,26 +76,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ -# create target directories -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} -mkdir -p $RPM_BUILD_ROOT/%{_bindir} -mkdir -p $RPM_BUILD_ROOT/%{_libdir}/%{name} - -# lets install these into the right place -install -pm 0755 release/rt $RPM_BUILD_ROOT/%{_bindir}/rt -install -pm 0755 release/rtstart $RPM_BUILD_ROOT/%{_bindir}/rtstart -cp -p release/options $RPM_BUILD_ROOT/%{_datadir}/%{name} -install -pm 0755 release/librtengine.so $RPM_BUILD_ROOT/%{_libdir}/%{name} -install -pm 0755 rtexif/librtexif.so $RPM_BUILD_ROOT/%{_libdir}/%{name} # icons -cp -p release/images/logoicon16.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/rawtherapee.png -cp -p release/images/logoicon32.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/rawtherapee.png - -# and add the shared files -cp -pr release/images $RPM_BUILD_ROOT/%{_datadir}/%{name}/ -cp -pr release/languages $RPM_BUILD_ROOT/%{_datadir}/%{name}/ -cp -pr release/profiles $RPM_BUILD_ROOT/%{_datadir}/%{name}/ -cp -pr release/themes $RPM_BUILD_ROOT/%{_datadir}/%{name}/ +cp -p rtdata/images/logoicon16.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/rawtherapee.png +cp -p rtdata/images/logoicon32.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/rawtherapee.png %clean @@ -133,7 +90,6 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi %{_bindir}/update-desktop-database %{_datadir}/applications || : -/sbin/ldconfig %postun %{_bindir}/update-desktop-database %{_datadir}/applications @@ -141,21 +97,27 @@ touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor fi || : -/sbin/ldconfig %files %defattr(-,root,root,-) %doc authors copying compile %{_bindir}/rt -%{_bindir}/rtstart -%{_libdir}/%{name}/librtengine.so -%{_libdir}/%{name}/librtexif.so %{_datadir}/%{name}/* %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/16x16/apps/rawtherapee.png %{_datadir}/icons/hicolor/32x32/apps/rawtherapee.png %changelog +* Tue Mar 23 2010 Thibault North - 3.0-0.14.a1 +- Remove sed liners which have been pushed upstream + +* Tue Mar 23 2010 Thibault North - 3.0-0.13.a1 +- Fix CMakeLists to build without extra languages and themes +- Remove PDF docs : development-related or outdated + +* Tue Mar 23 2010 Thibault North - 3.0-0.12.a1 +- Now rely on RawTherapee-Fork, new upstream + * Sat Mar 20 2010 Sebastian Dziallas - 3.0-0.11.a1 - Correct path in .desktop file diff --git a/sources b/sources index 75a486e..b4f8368 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d27ca91fe2cac07b5309bebfdd40c319 rawtherapee-3.0-a1.tar.bz2 +7fa2b72779719674130425906aa1e6ad rawtherapee-3.0-a1-fork.tar.bz2