[ossim-plugins] 01/05: Use packaged libraw instead of embedded copy.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository ossim-plugins.

commit dbfbcc96d41a1ddd48e3deaa54e5d5903ff4835e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 28 17:27:18 2016 +0200

    Use packaged libraw instead of embedded copy.
---
 debian/control              |  1 +
 debian/patches/libraw.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/control b/debian/control
index 140f66f..d205fab 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends: cmake (>= 2.8),
                libossim-dev (>= 1.8.20.3),
                libpng-dev,
                libpodofo-dev,
+               libraw-dev,
                libsqlite3-dev,
                libtiff-dev
 Standards-Version: 3.9.8
diff --git a/debian/patches/libraw.patch b/debian/patches/libraw.patch
new file mode 100644
index 0000000..e84346d
--- /dev/null
+++ b/debian/patches/libraw.patch
@@ -0,0 +1,34 @@
+Description: Use packaged libraw instead of embedded copy.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/ossim_plugins/libraw/CMakeLists.txt
++++ b/ossim_plugins/libraw/CMakeLists.txt
+@@ -6,13 +6,15 @@ include(OssimVersion)
+ include(OssimCommonVariables)
+ include(OssimUtilities)
+ 
+-SET(LIBRAW_SRC LibRaw-0.9.0)
++include(FindPkgConfig)
++pkg_search_module(LIBRAW libraw)
++
+ find_package(JPEG)
+ find_package(TIFF)
+-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${LIBRAW_SRC} ${JPEG_INCLUDE_DIR} ${TIFF_INCLUDE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${LIBRAW_INCLUDE_DIR} ${JPEG_INCLUDE_DIR} ${TIFF_INCLUDE_DIR})
+ 
+-FILE(GLOB OSSIMPLUGIN_SRCS ${LIBRAW_SRC}/internal/*.cpp ${LIBRAW_SRC}/src/*.cpp *.cpp)
+-FILE(GLOB OSSIMPLUGIN_HEADERS ${LIBRAW_SRC}/internal/*.h *.h ${LIBRAW_SRC}/libraw/*.h)
++FILE(GLOB OSSIMPLUGIN_SRCS *.cpp)
++FILE(GLOB OSSIMPLUGIN_HEADERS *.h)
+ 
+ ####
+ # OSSIMPLUGINSMAKINGDLL controls dll linkage on windows.  
+@@ -29,7 +31,7 @@ endif(OSSIM_INSTALL_PLUGINS_WITH_VERSION
+ 
+ OSSIM_LINK_LIBRARY(${LIB_NAME}
+                    COMPONENT_NAME ossim TYPE "${OSSIM_PLUGIN_LINK_TYPE}"
+-		   LIBRARIES ${OSSIM_LIBRARIES} ${OPENTHREADS_LIBRARY} ${JPEG_LIBRARY} ${TIFF_LIBRARY}
++		   LIBRARIES ${OSSIM_LIBRARIES} ${OPENTHREADS_LIBRARY} ${LIBRAW_LIBRARY} ${JPEG_LIBRARY} ${TIFF_LIBRARY}
+                    HEADERS "${OSSIMPLUGIN_HEADERS}"
+ 		   SOURCE_FILES "${OSSIMPLUGIN_SRCS}" ADDITIONAL_COMPILE_FLAGS "-DLIBRAW_NOTHREADS -DLIBRAW_NODLL"
+                    INSTALL_LIB)
diff --git a/debian/patches/series b/debian/patches/series
index ff3c88a..de95b6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 cmake.patch
 sqlite.patch
+libraw.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim-plugins.git