* [gentoo-commits] gentoo-x86 commit in media-gfx/darktable/files: darktable-0.9-cflags.patch darktable-0.9-automagic-deps.patch darktable-0.9-system-libraw.patch
@ 2011-07-21 8:55 Tim Harder (radhermit)
0 siblings, 0 replies; only message in thread
From: Tim Harder (radhermit) @ 2011-07-21 8:55 UTC (permalink / raw
To: gentoo-commits
radhermit 11/07/21 08:55:05
Added: darktable-0.9-cflags.patch
darktable-0.9-automagic-deps.patch
darktable-0.9-system-libraw.patch
Log:
Revision bump. Fix automagic deps, respect CFLAGS (fixes bug #375755), use system libraw library, and add the following use flags: debug, flickr, kde, nls, and slideshow. Add the graphics herd to metadata.
(Portage version: 2.2.0_alpha45/cvs/Linux x86_64)
Revision Changes Path
1.1 media-gfx/darktable/files/darktable-0.9-cflags.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/darktable/files/darktable-0.9-cflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/darktable/files/darktable-0.9-cflags.patch?rev=1.1&content-type=text/plain
Index: darktable-0.9-cflags.patch
===================================================================
--- darktable-0.9/src/CMakeLists.txt.orig
+++ darktable-0.9/src/CMakeLists.txt
@@ -217,27 +217,27 @@
# c++ code doesn't like -Werror (libraw)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
-if(NOT APPLE)
- # apple build fails on deprecated warnings..
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
-endif(NOT APPLE)
+#if(NOT APPLE)
+# # apple build fails on deprecated warnings..
+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+#endif(NOT APPLE)
if(NOT WIN32)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
endif(NOT WIN32)
-if(NOT BINARY_PACKAGE_BUILD)
- set(MARCH "-march=native")
-else()
- set(MARCH "-mtune=generic")
-endif()
+#if(NOT BINARY_PACKAGE_BUILD)
+# set(MARCH "-march=native")
+#else()
+# set(MARCH "-mtune=generic")
+#endif()
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g")
-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations")
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -D_DEBUG")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g")
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -D_DEBUG")
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g")
+#set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations")
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g")
+#set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
#
1.1 media-gfx/darktable/files/darktable-0.9-automagic-deps.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/darktable/files/darktable-0.9-automagic-deps.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/darktable/files/darktable-0.9-automagic-deps.patch?rev=1.1&content-type=text/plain
Index: darktable-0.9-automagic-deps.patch
===================================================================
--- darktable-0.9.orig/CMakeLists.txt
+++ darktable-0.9/CMakeLists.txt
@@ -4,6 +4,11 @@
option(USE_GCONF_BACKEND "Detect and use gconf backend if available." ON)
option(USE_CAMERA_SUPPORT "Detect and use camera support if available." ON)
+option(USE_NLS "Build Native Language Support (using gettext)" ON)
+option(USE_FLICKR "Enable Flickr support" ON)
+option(USE_KWALLET "Build kwallet password storage backend" ON)
+option(USE_GNOME_KEYRING "Build gnome-keyring password storage backend" ON)
+option(BUILD_SLIDESHOW "Build the opengl slideshow viewer" ON)
option(USE_OPENMP "Use openmp threading support." ON)
option(USE_OPENCL "Use OpenCL support." ON)
option(USE_DARKTABLE_PROFILING OFF)
--- darktable-0.9.orig/src/CMakeLists.txt
+++ darktable-0.9/src/CMakeLists.txt
@@ -124,51 +124,61 @@
add_definitions(${${lib}_DEFINITIONS})
endforeach(lib)
-find_package(Gettext)
-if(Gettext_FOUND)
- include_directories(${Gettext_INCLUDE_DIRS})
- list(APPEND LIBS ${Gettext_LIBRARIES})
- add_definitions("-DUSE_GETTEXT")
- message(STATUS "Internationalization: Enabled")
-else()
- message(STATUS "Internationalization: Disabled (libintl not found)")
-endif()
-
-find_package(FLICKCURL)
-if(FLICKCURL_FOUND)
- include_directories(${FLICKCURL_INCLUDE_DIRS})
- list(APPEND LIBS ${FLICKCURL_LIBRARIES})
- add_definitions(${FLICKCURL_DEFINITIONS})
-endif(FLICKCURL_FOUND)
+if(USE_NLS)
+ find_package(Gettext)
+ if(Gettext_FOUND)
+ include_directories(${Gettext_INCLUDE_DIRS})
+ list(APPEND LIBS ${Gettext_LIBRARIES})
+ add_definitions("-DUSE_GETTEXT")
+ message(STATUS "Internationalization: Enabled")
+ else()
+ message(STATUS "Internationalization: Disabled (libintl not found)")
+ endif()
+endif(USE_NLS)
+
+if(USE_FLICKR)
+ find_package(FLICKCURL)
+ if(FLICKCURL_FOUND)
+ include_directories(${FLICKCURL_INCLUDE_DIRS})
+ list(APPEND LIBS ${FLICKCURL_LIBRARIES})
+ add_definitions(${FLICKCURL_DEFINITIONS})
+ endif(FLICKCURL_FOUND)
+endif(USE_FLICKR)
#
# Detect compile of optional pwstorage backends
#
+if(USE_KWALLET)
find_package(DBUSGLIB)
-if(DBUSGLIB_FOUND)
- list(APPEND SOURCES "common/pwstorage/backend_kwallet.c")
- include_directories(${DBUSGLIB_INCLUDE_DIRS})
- list(APPEND LIBS ${DBUSGLIB_LIBRARIES})
- add_definitions("-DHAVE_KWALLET")
-endif(DBUSGLIB_FOUND)
-
-find_package(GnomeKeyring)
-if(GNOMEKEYRING_FOUND)
- set(SOURCES ${SOURCES} "common/pwstorage/backend_gkeyring.c")
- include_directories(${GnomeKeyring_INCLUDE_DIRS})
- list(APPEND LIBS ${GnomeKeyring_LIBRARIES})
- add_definitions("-DHAVE_GKEYRING")
-endif(GNOMEKEYRING_FOUND)
+ if(DBUSGLIB_FOUND)
+ list(APPEND SOURCES "common/pwstorage/backend_kwallet.c")
+ include_directories(${DBUSGLIB_INCLUDE_DIRS})
+ list(APPEND LIBS ${DBUSGLIB_LIBRARIES})
+ add_definitions("-DHAVE_KWALLET")
+ endif(DBUSGLIB_FOUND)
+endif(USE_KWALLET)
+
+if(USE_GNOME_KEYRING)
+ find_package(GnomeKeyring)
+ if(GNOMEKEYRING_FOUND)
+ set(SOURCES ${SOURCES} "common/pwstorage/backend_gkeyring.c")
+ include_directories(${GnomeKeyring_INCLUDE_DIRS})
+ list(APPEND LIBS ${GnomeKeyring_LIBRARIES})
+ add_definitions("-DHAVE_GKEYRING")
+ endif(GNOMEKEYRING_FOUND)
+endif(USE_GNOME_KEYRING)
# have a small test program, to be run as root on some systems to enable the driver to run cl stuff
add_subdirectory(cltest)
# build opengl slideshow viewer?
-find_package(SDL)
-find_package(OpenGL)
-if(SDL_FOUND AND OPENGL_FOUND)
- add_subdirectory(dtview)
-endif(SDL_FOUND AND OPENGL_FOUND)
+if(BUILD_SLIDESHOW)
+ find_package(SDL)
+ find_package(OpenGL)
+ if(SDL_FOUND AND OPENGL_FOUND)
+ add_subdirectory(dtview)
+ endif(SDL_FOUND AND OPENGL_FOUND)
+endif(BUILD_SLIDESHOW)
# needed for the file manager
if(APRIL_FOOLS)
1.1 media-gfx/darktable/files/darktable-0.9-system-libraw.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/darktable/files/darktable-0.9-system-libraw.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/darktable/files/darktable-0.9-system-libraw.patch?rev=1.1&content-type=text/plain
Index: darktable-0.9-system-libraw.patch
===================================================================
--- darktable-0.9.orig/cmake/modules/FindLibraw.cmake
+++ darktable-0.9/cmake/modules/FindLibraw.cmake
@@ -0,0 +1,29 @@
+# - Try to find libraw
+# Once done, this will define
+#
+# Libraw_FOUND - system has Libraw
+# Libraw_INCLUDE_DIRS - the Libraw include directories
+# Libraw_LIBRARIES - link these to use Libraw
+
+include(LibFindMacros)
+
+# Use pkg-config to get hints about paths
+libfind_pkg_check_modules(Libraw_PKGCONF libraw)
+
+# Include dir
+find_path(Libraw_INCLUDE_DIR
+ NAMES libraw.h
+ PATHS ${Libraw_PKGCONF_INCLUDE_DIRS}
+)
+
+# Finally the library itself
+find_library(Libraw_LIBRARY
+ NAMES raw_r
+ PATHS ${Libraw_PKGCONF_LIBRARY_DIRS}
+)
+
+# Set the include dir variables and the libraries and let libfind_process do the rest.
+# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+set(Libraw_PROCESS_INCLUDES Libraw_INCLUDE_DIR Libraw_INCLUDE_DIRS)
+set(Libraw_PROCESS_LIBS Libraw_LIBRARY Libraw_LIBRARIES)
+libfind_process(Libraw)
--- darktable-0.9.orig/src/CMakeLists.txt
+++ darktable-0.9/src/CMakeLists.txt
@@ -65,7 +65,6 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/LibRaw)
# initial compiler flags
add_definitions("-DHAVE_CONFIG_H")
@@ -117,7 +116,7 @@
endif(USE_CAMERA_SUPPORT)
# Find all the libs that don't require extra parameters
-foreach(lib ${OUR_LIBS} LensFun GIO GThread GModule Cairo PangoCairo PThread Rsvg2 GDK-PixBuf LibXml2 INotify Sqlite3 Exiv2 CURL PNG JPEG TIFF OpenEXR LCMS2)
+foreach(lib ${OUR_LIBS} LensFun Libraw GIO GThread GModule Cairo PangoCairo PThread Rsvg2 GDK-PixBuf LibXml2 INotify Sqlite3 Exiv2 CURL PNG JPEG TIFF OpenEXR LCMS2)
find_package(${lib} REQUIRED)
include_directories(${${lib}_INCLUDE_DIRS})
list(APPEND LIBS ${${lib}_LIBRARIES})
@@ -280,17 +279,6 @@
set_target_properties(lib_darktable PROPERTIES LINKER_LANGUAGE C)
-#
-# the libraw part is a bit of a hack:
-# the static linking didn't work since it was pulling -lstdc++ and -lm into linker flags.
-# so we do a custom dependency and pretend an imported liblibraw_r.a so no other -l are
-# appended.
-#
-add_dependencies(lib_darktable libraw_r)
-add_library(libraw_static STATIC IMPORTED)
-set_target_properties(libraw_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/LibRaw/liblibraw_r.a)
-target_link_libraries(lib_darktable ${LIBS} libraw_static)
-
# same for librawspeed (can switch it off with -DDONT_USE_RAWSPEED, for macs):
if(NOT DONT_USE_RAWSPEED)
add_definitions("-DHAVE_RAWSPEED")
@@ -305,9 +293,6 @@
install(TARGETS lib_darktable DESTINATION ${LIB_INSTALL}/darktable)
list(APPEND LIBS lib_darktable)
-# Compile libraw modules
-add_subdirectory(LibRaw)
-
# Compile views modules
add_subdirectory(views)
--- darktable-0.9.orig/src/common/imageio.c
+++ darktable-0.9/src/common/imageio.c
@@ -547,7 +547,7 @@
raw->params.threshold = 0;
raw->params.auto_bright_thr = img->raw_auto_bright_threshold;
- raw->params.amaze_ca_refine = 0;
+ // raw->params.amaze_ca_refine = 0;
raw->params.fbdd_noiserd = 0;
ret = libraw_open_file(raw, filename);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-21 8:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-21 8:55 [gentoo-commits] gentoo-x86 commit in media-gfx/darktable/files: darktable-0.9-cflags.patch darktable-0.9-automagic-deps.patch darktable-0.9-system-libraw.patch Tim Harder (radhermit)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox