rpms/rawtherapee/devel import.log, NONE, 1.1 rawtherapee-lcms.patch, NONE, 1.1 rawtherapee-rawzor.patch, NONE, 1.1 rawtherapee.desktop, NONE, 1.1 rawtherapee.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Sebastian Dziallas
sdz at fedoraproject.org
Sat Mar 20 12:37:33 UTC 2010
- Previous message: File rawtherapee-3.0-a1.tar.bz2 uploaded to lookaside cache by sdz
- Next message: rpms/rawtherapee/F-13 import.log, NONE, 1.1 rawtherapee-lcms.patch, NONE, 1.1 rawtherapee-rawzor.patch, NONE, 1.1 rawtherapee.desktop, NONE, 1.1 rawtherapee.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sdz
Update of /cvs/pkgs/rpms/rawtherapee/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31933/devel
Modified Files:
.cvsignore sources
Added Files:
import.log rawtherapee-lcms.patch rawtherapee-rawzor.patch
rawtherapee.desktop rawtherapee.spec
Log Message:
initial import
--- NEW FILE import.log ---
rawtherapee-3_0-0_10_a1_fc12:HEAD:rawtherapee-3.0-0.10.a1.fc12.src.rpm:1269088598
rawtherapee-lcms.patch:
CMakeLists.txt | 3 +
rtengine/CMakeLists.txt | 45 ++++++++++---------
rtengine/bilateral2.h | 4 -
rtengine/dcraw.cc | 1
rtengine/hlmultipliers.cc | 2
rtengine/imagedata.cc | 2
rtengine/myfile.cc | 2
rtgui/CMakeLists.txt | 108 ++++++++++++++++++++++++++++------------------
8 files changed, 100 insertions(+), 67 deletions(-)
--- NEW FILE rawtherapee-lcms.patch ---
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 <alignedbuffer.h>
#include <mytime.h>
#include <gauss.h>
-
-#define MAX(a,b) ((a)<(b)?(b):(a))
-#define MIN(a,b) ((a)>(b)?(b):(a))
+#include <glibmm.h>
#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 <stdio.h>
#include <rawimagesource.h>
-#define MAX(a,b) ((a)<(b)?(b):(a))
-
#define MAXVAL 0xffff
#define CLIP(a) ((a)>0?((a)<MAXVAL?(a):MAXVAL):0)
diff --git a/rtengine/imagedata.cc b/rtengine/imagedata.cc
index dd5055a..3b172fc 100755
--- a/rtengine/imagedata.cc
+++ b/rtengine/imagedata.cc
@@ -19,7 +19,9 @@
#include <imagedata.h>
#include <iptcpairs.h>
#include <glib/gstdio.h>
+#ifdef RAWZOR_SUPPORT
#include <rwz_sdk.h>
+#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 <myfile.h>
#include <cstdarg>
#include <glibmm.h>
+#ifdef RAWZOR_SUPPORT
#include <rwz_sdk.h>
+#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)
rawtherapee-rawzor.patch:
CMakeLists.txt | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE rawtherapee-rawzor.patch ---
--- 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)
--- NEW FILE rawtherapee.desktop ---
[Desktop Entry]
Type=Application
Categories=Graphics;Photography;GTK;
Name=Rawtherapee
GenericName=Raw image converter
Comment=Read, modify and export digital-camera raw files
Exec=rawtherapee %F
StartupNotify=true
Icon=rawtherapee
MimeType=image/x-dcraw;
--- NEW FILE rawtherapee.spec ---
# Tarfile created using svn
# svn checkout http://rawtherapee.googlecode.com/svn/tags/release-%{version}-%{prerelease}/ %{name}
# cd %{name}
# svn export . %{name}-%{version}
# cd %{name}-%{version}
# rm -rf rawzor_*
# rm -f release/themes/* tools/createicon.exe
# 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}
%global prerelease a1
%global tarfile %{name}-%{version}-%{prerelease}.tar.bz2
Name: rawtherapee
Version: 3.0
Release: 0.10.%{prerelease}%{?dist}
Summary: Raw image processing software
Group: Applications/Multimedia
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)
BuildRequires: cmake >= 2.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
%description
Rawtherapee is a RAW image processing software. It gives full control over
many parameters to enhance the raw picture before finally exporting it
to some common image format.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
# adjust header locations
sed -i "s|#include <gtkmm.h>|#include <gtkmm.h>\\n#include <stdio.h>|" 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 {} ';'
# fix wrong line endings
sed -i "s|\r||g" authors compile
# settle more permissions
chmod a-x {authors,compile,copying}
%build
%{cmake} %{?BUILD_TESTS} .
make VERBOSE=1 %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install
desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \
%{SOURCE1}
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}/
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor
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
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
* Wed Mar 17 2010 Thibault North <tnorth at fedoraproject.org> - 3.0-0.10.a1
- Run ldconfig at post/postun
* Mon Mar 15 2010 Thibault North <tnorth at fedoraproject.org> - 3.0-0.9.a1
- Use proper license tag
- Remove some files with different licensing
* Fri Mar 3 2010 Thibault North <tnorth at fedoraproject.org> - 3.0-0.8.a1
- Various fixes related to review request.
* Sat Feb 28 2010 Thibault North <tnorth at fedoraproject.org> - 3.0-0.7.a1
- Update icon database on install/removal
- Fix many files permissions (thanks Sebastian Dziallas)
* Sat Feb 28 2010 Thibault North <tnorth at fedoraproject.org> - 3.0-0.6.a1
- Set icons for desktop file
- Remove rawzor from SRPM
* Sat Feb 28 2010 Thibault North <tnorth at fedoraproject.org> - 3.0-0.5.a1
- More fixes and added desktop file
* Wed Feb 24 2010 Sebastian Dziallas <sebastian at when.com> - 3.0-0.4.a1
- Smaller modifications and changes
* Sun Jan 24 2010 Sebastian Dziallas <sebastian at when.com> - 3.0-0.3.a1
- Switch to a1 SVN checkout
* Sun Jan 24 2010 Thibault North <tnorth at fedoraproject.org> - 3.0-0.2.a1
- Various Fixes
* Fri Jan 22 2010 Thibault North <tnorth at fedoraproject.org> - 3.0-0.1.a1
- Initial package
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rawtherapee/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 19 Mar 2010 20:06:22 -0000 1.1
+++ .cvsignore 20 Mar 2010 12:37:32 -0000 1.2
@@ -0,0 +1 @@
+rawtherapee-3.0-a1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rawtherapee/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 19 Mar 2010 20:06:22 -0000 1.1
+++ sources 20 Mar 2010 12:37:33 -0000 1.2
@@ -0,0 +1 @@
+d27ca91fe2cac07b5309bebfdd40c319 rawtherapee-3.0-a1.tar.bz2
- Previous message: File rawtherapee-3.0-a1.tar.bz2 uploaded to lookaside cache by sdz
- Next message: rpms/rawtherapee/F-13 import.log, NONE, 1.1 rawtherapee-lcms.patch, NONE, 1.1 rawtherapee-rawzor.patch, NONE, 1.1 rawtherapee.desktop, NONE, 1.1 rawtherapee.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list