[ossim-plugins] 01/01: Use upstream CMakeModules instead of pkg-config patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Mon May 30 20:55:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository ossim-plugins.
commit fd5000147fdb13c57862e2a15b737ed8907b1728
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon May 30 22:17:08 2016 +0200
Use upstream CMakeModules instead of pkg-config patches.
---
debian/patches/cmake.patch | 471 ++++++++++++++++++++++++++++++++++++++++++++
debian/patches/fftw3.patch | 45 -----
debian/patches/opencv.patch | 16 --
debian/patches/series | 3 -
debian/patches/sqlite.patch | 21 --
debian/rules | 4 +-
6 files changed, 472 insertions(+), 88 deletions(-)
diff --git a/debian/patches/cmake.patch b/debian/patches/cmake.patch
index 3036895..1fcb161 100644
--- a/debian/patches/cmake.patch
+++ b/debian/patches/cmake.patch
@@ -1842,3 +1842,474 @@ Forwarded: not-needed
+ MESSAGE(STATUS "File \"${file}\" does not exist.")
+ ENDIF()
+ENDFOREACH()
+--- /dev/null
++++ b/ossim_plugins/CMakeModules/FindFFTW3.cmake
+@@ -0,0 +1,24 @@
++# - Find fftw3 library
++# Find the native fftw3 includes and library
++# This module defines
++# FFTW3_INCLUDE_DIR, where to find tiff.h, etc.
++# FFTW3_LIBRARIES, libraries to link against to use FFTW3.
++# FFTW3_FOUND, If false, do not try to use FFTW3.
++# also defined, but not for general use are
++# FFTW3_LIBRARY, where to find the FFTW3 library.
++
++FIND_PATH(FFTW3_INCLUDE_DIR fftw3.h)
++
++SET(FFTW3_NAMES ${FFTW3_NAMES} fftw3 libfftw3)
++FIND_LIBRARY(FFTW3_LIBRARY NAMES ${FFTW3_NAMES} )
++
++# handle the QUIETLY and REQUIRED arguments and set FFTW3_FOUND to TRUE if
++# all listed variables are TRUE
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFTW3 DEFAULT_MSG FFTW3_LIBRARY FFTW3_INCLUDE_DIR)
++
++IF(FFTW3_FOUND)
++ SET( FFTW3_LIBRARIES ${FFTW3_LIBRARY} )
++ENDIF(FFTW3_FOUND)
++
++MARK_AS_ADVANCED(FFTW3_INCLUDE_DIR FFTW3_LIBRARY)
+--- /dev/null
++++ b/ossim_plugins/CMakeModules/FindLCMS2.cmake
+@@ -0,0 +1,56 @@
++###
++# -*- cmake -*-
++#
++# File: FindLCMS2.cmake
++#
++# Original script was copied from:
++# http://code.google.com/p/emeraldviewer/source/browse/indra/cmake
++#
++# $Id: FindLCMS2.cmake 23010 2014-12-01 21:47:43Z dburken $
++###
++
++# - Find LCMS2
++# Find the LCMS2 includes and library
++# This module defines
++# LCMS2_INCLUDE_DIR, where to find lcms2.h, etc.
++# LCMS2_LIBRARIES, the libraries needed to use LCMS2.
++# LCMS2_FOUND, If false, do not try to use LCMS2.
++# also defined, but not for general use are
++# LCMS2_LIBRARY, where to find the LCMS2 library.
++
++FIND_PATH(LCMS2_INCLUDE_DIR lcms2.h
++ PATHS
++ /usr/local/include/lcms2
++ /usr/local/include
++ /usr/include/lcms2
++ /usr/include
++ PATH_SUFFIXES
++ lcms2-2.6
++ DOC "Location of LCMS2 Headers"
++)
++
++SET(LCMS2_NAMES ${LCMS2_NAMES} lcms2)
++FIND_LIBRARY(LCMS2_LIBRARY
++ NAMES ${LCMS2_NAMES}
++ PATHS /usr/lib /usr/local/lib
++ )
++
++IF (LCMS2_LIBRARY AND LCMS2_INCLUDE_DIR)
++ SET(LCMS2_LIBRARIES ${LCMS2_LIBRARY})
++ SET(LCMS2_FOUND "YES")
++ELSE (LCMS2_LIBRARY AND LCMS2_INCLUDE_DIR)
++ SET(LCMS2_FOUND "NO")
++ENDIF (LCMS2_LIBRARY AND LCMS2_INCLUDE_DIR)
++
++
++IF (LCMS2_FOUND)
++ IF (NOT LCMS2_FIND_QUIETLY)
++ MESSAGE(STATUS "Found LCMS2: ${LCMS2_LIBRARIES}")
++ ENDIF (NOT LCMS2_FIND_QUIETLY)
++ELSE (LCMS2_FOUND)
++ IF (LCMS2_FIND_REQUIRED)
++ MESSAGE(FATAL_ERROR "Could not find LCMS2 library")
++ ENDIF (LCMS2_FIND_REQUIRED)
++ENDIF (LCMS2_FOUND)
++
++MARK_AS_ADVANCED(LCMS2_LIBRARY LCMS2_INCLUDE_DIR)
+--- /dev/null
++++ b/ossim_plugins/CMakeModules/FindOpenCV.cmake
+@@ -0,0 +1,85 @@
++#---
++# File: FindOpenCV.cmake
++#
++# Locate OPENCV
++#
++# This module defines:
++#
++# OPENCV_INCLUDE_DIR
++#
++# OPENCV_FOUND,
++# OPENCV_CORE_FOUND
++# OPENCV_HIGHGUI_FOUND
++# OPENCV_IMGPROC_FOUND
++# OPENCV_LEGACY_FOUND
++# OPENCV_ML_FOUND
++#
++# OPENCV_CORE_LIBRARY
++# OPENCV_HIGHGUI_LIBRARY
++# OPENCV_IMGPROC_LIBRARY
++# OPENCV_LEGACY_LIBRARY
++# OPENCV_ML_LIBRARY
++# OPENCV_LIBRARIES
++#
++# Created by Garrett Potts.
++#
++# $Id: FindOpenCV.cmake 22635 2014-02-20 14:28:45Z dburken $
++
++# Find include path:
++find_path(OPENCV_INCLUDE_DIR opencv2/opencv.hpp PATHS /usr/include/opencv2 /usr/local/include)
++
++macro(FIND_OPENCV_LIBRARY MYLIBRARY MYLIBRARYNAME)
++
++ find_library( ${MYLIBRARY}
++ NAMES "${MYLIBRARYNAME}${OPENCV_RELEASE_POSTFIX}"
++ PATHS
++ /usr/lib64
++ /usr/lib
++ /usr/local/lib
++ )
++
++endmacro(FIND_OPENCV_LIBRARY MYLIBRARY MYLIBRARYNAME)
++
++FIND_OPENCV_LIBRARY(OPENCV_CALIB3D_LIBRARY opencv_calib3d)
++FIND_OPENCV_LIBRARY(OPENCV_CONTRIB_LIBRARY opencv_contrib)
++FIND_OPENCV_LIBRARY(OPENCV_CORE_LIBRARY opencv_core)
++FIND_OPENCV_LIBRARY(OPENCV_FEATURES2D_LIBRARY opencv_features2d)
++FIND_OPENCV_LIBRARY(OPENCV_FLANN_LIBRARY opencv_flann)
++FIND_OPENCV_LIBRARY(OPENCV_GPU_LIBRARY opencv_gpu)
++FIND_OPENCV_LIBRARY(OPENCV_HIGHGUI_LIBRARY opencv_highgui)
++FIND_OPENCV_LIBRARY(OPENCV_IMGPROC_LIBRARY opencv_imgproc)
++FIND_OPENCV_LIBRARY(OPENCV_LEGACY_LIBRARY opencv_legacy)
++FIND_OPENCV_LIBRARY(OPENCV_ML_LIBRARY opencv_ml)
++
++message( STATUS "OPENCV_INCLUDE_DIR = ${OPENCV_INCLUDE_DIR}" )
++message( STATUS "OPENCV_CALIB3D_LIBRARY = ${OPENCV_CALIB3D_LIBRARY}" )
++message( STATUS "OPENCV_CONTRIB_LIBRARY = ${OPENCV_CONTRIB_LIBRARY}" )
++message( STATUS "OPENCV_CORE_LIBRARY = ${OPENCV_CORE_LIBRARY}" )
++message( STATUS "OPENCV_FEATURES2D_LIBRARY = ${OPENCV_FEATURES2D_LIBRARY}" )
++message( STATUS "OPENCV_FLANN_LIBRARY = ${OPENCV_FLANN_LIBRARY}" )
++message( STATUS "OPENCV_GPU_LIBRARY = ${OPENCV_GPU_LIBRARY}" )
++message( STATUS "OPENCV_HIGHGUI_LIBRARY = ${OPENCV_HIGHGUI_LIBRARY}" )
++message( STATUS "OPENCV_IMGPROC_LIBRARY = ${OPENCV_IMGPROC_LIBRARY}" )
++message( STATUS "OPENCV_LEGACY_LIBRARY = ${OPENCV_LEGACY_LIBRARY}" )
++message( STATUS "OPENCV_ML_LIBRARY = ${OPENCV_ML_LIBRARY}" )
++
++
++# Removed OPENCV_GPU_LIBRARY AND (drb 20140220)
++
++set(OPENCV_FOUND "NO")
++
++if(OPENCV_INCLUDE_DIR AND OPENCV_CALIB3D_LIBRARY AND OPENCV_CONTRIB_LIBRARY AND OPENCV_CORE_LIBRARY AND OPENCV_FEATURES2D_LIBRARY AND OPENCV_FLANN_LIBRARY AND OPENCV_HIGHGUI_LIBRARY AND OPENCV_IMGPROC_LIBRARY AND OPENCV_LEGACY_LIBRARY AND OPENCV_ML_LIBRARY)
++
++ set(OPENCV_FOUND "YES")
++
++ # Removed ${OPENCV_GPU_LIBRARY} (drb 20140220)
++
++ set(OPENCV_LIBRARIES ${OPENCV_CALIB3D_LIBRARY} ${OPENCV_CONTRIB_LIBRARY} ${OPENCV_CORE_LIBRARY} ${OPENCV_FEATURES2D_LIBRARY} ${OPENCV_FLANN_LIBRARY} ${OPENCV_HIGHGUI_LIBRARY} ${OPENCV_IMGPROC_LIBRARY} ${OPENCV_LEGACY_LIBRARY} ${OPENCV_ML_LIBRARY})
++
++ message( STATUS "OPENCV_LIBRARIES = ${OPENCV_LIBRARIES}" )
++
++else(OPENCV_INCLUDE_DIR AND OPENCV_CORE_LIBRARY AND OPENCV_HIGHGUI_LIBRARY AND OPENCV_IMGPROC_LIBRARY AND OPENCV_LEGACY_LIBRARY AND OPENCV_ML_LIBRARY)
++
++ message( WARNING "Could not find OPENCV" )
++
++endif(OPENCV_INCLUDE_DIR AND OPENCV_CALIB3D_LIBRARY AND OPENCV_CONTRIB_LIBRARY AND OPENCV_CORE_LIBRARY AND OPENCV_FEATURES2D_LIBRARY AND OPENCV_FLANN_LIBRARY AND OPENCV_HIGHGUI_LIBRARY AND OPENCV_IMGPROC_LIBRARY AND OPENCV_LEGACY_LIBRARY AND OPENCV_ML_LIBRARY)
+--- /dev/null
++++ b/ossim_plugins/CMakeModules/FindOpenJPEG.cmake
+@@ -0,0 +1,56 @@
++###
++# -*- cmake -*-
++#
++# File: FindOpenJPEG.cmake
++#
++# Original script was copied from:
++# http://code.google.com/p/emeraldviewer/source/browse/indra/cmake
++#
++# $Id: FindOpenJPEG.cmake 23010 2014-12-01 21:47:43Z dburken $
++###
++
++# - Find OpenJPEG
++# Find the OpenJPEG includes and library
++# This module defines
++# OPENJPEG_INCLUDE_DIR, where to find openjpeg.h, etc.
++# OPENJPEG_LIBRARIES, the libraries needed to use OpenJPEG.
++# OPENJPEG_FOUND, If false, do not try to use OpenJPEG.
++# also defined, but not for general use are
++# OPENJPEG_LIBRARY, where to find the OpenJPEG library.
++
++FIND_PATH(OPENJPEG_INCLUDE_DIR openjpeg.h
++ PATHS
++ /usr/local/include/openjpeg
++ /usr/local/include
++ /usr/include/openjpeg
++ /usr/include
++ PATH_SUFFIXES
++ openjpeg-2.1
++ DOC "Location of OpenJPEG Headers"
++)
++
++SET(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjp2)
++FIND_LIBRARY(OPENJPEG_LIBRARY
++ NAMES ${OPENJPEG_NAMES}
++ PATHS /usr/lib /usr/local/lib
++ )
++
++IF (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
++ SET(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY})
++ SET(OPENJPEG_FOUND "YES")
++ELSE (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
++ SET(OPENJPEG_FOUND "NO")
++ENDIF (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
++
++
++IF (OPENJPEG_FOUND)
++ IF (NOT OPENJPEG_FIND_QUIETLY)
++ MESSAGE(STATUS "Found OpenJPEG: ${OPENJPEG_LIBRARIES}")
++ ENDIF (NOT OPENJPEG_FIND_QUIETLY)
++ELSE (OPENJPEG_FOUND)
++ IF (OPENJPEG_FIND_REQUIRED)
++ MESSAGE(FATAL_ERROR "Could not find OpenJPEG library")
++ ENDIF (OPENJPEG_FIND_REQUIRED)
++ENDIF (OPENJPEG_FOUND)
++
++MARK_AS_ADVANCED(OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR)
+--- /dev/null
++++ b/ossim_plugins/CMakeModules/FindPDAL.cmake
+@@ -0,0 +1,66 @@
++#---
++# File: FindPDAL.cmake
++#
++# Find the native Point Data Abstraction Library(PDAL) includes and libraries.
++#
++# This module defines:
++#
++# PDAL_INCLUDE_DIR, where to find pdal.h, etc.
++# PDAL_LIBRARIES, libraries to link against to use PDAL and rialto.
++# PDAL_FOUND, True if found, false if one of the above are not found.
++#
++# NOTE:
++# This script is specialized for ossim, e.g. looking in /usr/local/ossim.
++#
++# $Id$
++#---
++#---
++# Find include path: "pdal_defines.h" installs to install "prefix" with pdal
++# includes under "pdal" sub directory.
++#---
++find_path( PDAL_INCLUDE_DIR pdal/pdal.hpp
++ PATHS
++ ${OSSIM_DEPENDENCIES}/include
++ /usr/include
++ /usr/local/include
++ /usr/local/ossim/include )
++
++macro(FIND_PDAL_LIBRARY MYLIBRARY MYLIBRARYNAME)
++
++ find_library( ${MYLIBRARY}
++ NAMES "${MYLIBRARYNAME}"
++ PATHS
++ ${OSSIM_DEPENDENCIES}/lib
++ /usr/lib64
++ /usr/lib
++ /usr/local/lib
++ )
++
++endmacro(FIND_PDAL_LIBRARY MYLIBRARY MYLIBRARYNAME)
++
++FIND_PDAL_LIBRARY(PDAL_CPP_LIBRARY pdalcpp)
++FIND_PDAL_LIBRARY(PDAL_UTIL_LIBRARY pdal_util)
++FIND_PDAL_LIBRARY(RIALTO_LIBRARY rialto)
++FIND_PDAL_LIBRARY(LASZIP_LIBRARY laszip)
++
++message( STATUS "PDAL_INCLUDE_DIR = ${PDAL_INCLUDE_DIR}" )
++message( STATUS "PDAL_CPP_LIBRARY = ${PDAL_CPP_LIBRARY}" )
++message( STATUS "PDAL_UTIL_LIBRARY = ${PDAL_UTIL_LIBRARY}" )
++message( STATUS "RIALTO_LIBRARY = ${RIALTO_LIBRARY}" )
++message( STATUS "LASZIP_LIBRARY = ${LASZIP_LIBRARY}" )
++
++set(PDAL_FOUND "NO")
++
++if (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY AND RIALTO_LIBRARY AND LASZIP_LIBRARY)
++
++ set(PDAL_FOUND "YES")
++ set(PDAL_LIBRARIES ${PDAL_CPP_LIBRARY} ${PDAL_UTIL_LIBRARY} ${RIALTO_LIBRARY} ${LASZIP_LIBRARY})
++ message( STATUS "PDAL_LIBRARIES = ${PDAL_LIBRARIES}" )
++
++else(PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY AND RIALTO_LIBRARY AND LASZIP_LIBRARY)
++
++ message( WARNING "Could not find PDAL" )
++
++endif(PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY AND RIALTO_LIBRARY AND LASZIP_LIBRARY)
++
++
+--- /dev/null
++++ b/ossim_plugins/CMakeModules/FindPodofo.cmake
+@@ -0,0 +1,25 @@
++#---
++# File: FindPodofo.cmake
++#
++# Find the native podofo includes and library
++#
++# This module defines:
++# PODOFO_INCLUDE_DIR, where to find tiff.h, etc.
++# PODOFO_LIBRARY, library to link against to use PODOFO.
++# PODOFO_FOUND, If false, do not try to use PODOFO.
++#
++# $Id: FindPodofo.cmake 19868 2011-07-23 13:23:49Z dburken $
++#---
++
++# Find include path:
++find_path(PODOFO_INCLUDE_DIR podofo/podofo.h PATHS /usr/include /usr/local/include
++)
++
++# Find library:
++find_library(PODOFO_LIBRARY NAMES podofo PATHS /usr/lib64 /usr/lib /usr/local/lib)
++
++#---
++# This function sets PODOFO_FOUND if variables are valid.
++#---
++include(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(PODOFO DEFAULT_MSG PODOFO_LIBRARY PODOFO_INCLUDE_DIR)
+--- /dev/null
++++ b/ossim_plugins/CMakeModules/FindSQLITE.cmake
+@@ -0,0 +1,61 @@
++#---
++# File: FindSQLITE.cmake
++#
++# Find the native SQLite includes and libraries.
++#
++# This module defines:
++#
++# SQLITE_INCLUDE_DIR, where to find sqlite3.h, etc.
++# SQLITE_LIBRARY, libraries to link against to use SQLITE.
++# SQLITE_FOUND, True if found, false if one of the above are not found.
++#
++# For ossim, typically SQLite will be system installed which should be found;
++# or found in the ossim 3rd party dependencies directory from a SQLite build
++# and install. If the latter it will rely on CMAKE_INCLUDE_PATH and
++# CMAKE_LIBRARY_PATH having the path to the party dependencies directory.
++#
++# $Id$
++#---
++
++#---
++# Find include path:
++#---
++find_path( SQLITE_INCLUDE_DIR sqlite3.h
++ PATHS
++ /usr/include
++ /usr/local/include )
++
++# Find SQLITE library:
++find_library( SQLITE_LIB NAMES sqlite3
++ PATHS
++ /usr/lib64
++ /usr/lib
++ /usr/local/lib )
++
++# Set the SQLITE_LIBRARY:
++if( SQLITE_LIB )
++ set( SQLITE_LIBRARY ${SQLITE_LIB} CACHE STRING INTERNAL )
++endif(SQLITE_LIB )
++
++#---
++# This function sets SQLITE_FOUND if variables are valid.
++#---
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args( SQLITE DEFAULT_MSG
++ SQLITE_LIBRARY
++ SQLITE_INCLUDE_DIR )
++
++if( SQLITE_FOUND )
++ if( NOT SQLITE_FIND_QUIETLY )
++ message( STATUS "Found SQLITE..." )
++ endif( NOT SQLITE_FIND_QUIETLY )
++else( SQLITE_FOUND )
++ if( NOT SQLITE_FIND_QUIETLY )
++ message( WARNING "Could not find SQLITE" )
++ endif( NOT SQLITE_FIND_QUIETLY )
++endif( SQLITE_FOUND )
++
++if( NOT SQLITE_FIND_QUIETLY )
++ message( STATUS "SQLITE_INCLUDE_DIR=${SQLITE_INCLUDE_DIR}" )
++ message( STATUS "SQLITE_LIBRARY=${SQLITE_LIBRARY}" )
++endif( NOT SQLITE_FIND_QUIETLY )
+--- /dev/null
++++ b/ossim_plugins/CMakeModules/FindHDF5A.cmake
+@@ -0,0 +1,74 @@
++#---
++# File: FindHDF5A.cmake
++#
++# Find the native HDF5A includes and libraries.
++#
++# This module defines:
++#
++# HDF5A_INCLUDE_DIR, where to find geos.h, etc.
++# HDF5A_LIBRARIES, libraries to link against to use HDF5A.
++# HDF5A_FOUND, True if found, false if one of the above are not found.
++#
++# NOTE:
++#
++# This script is specialized for ossim. HDF5A rpm created to fix conflict with
++# system installed hdf5 packages that do NOT have compression(szip) support.
++#
++# $Id$
++#---
++
++# Find include path:
++find_path( HDF5A_INCLUDE_DIR hdf5.h
++ PATHS
++ ${CMAKE_INSTALL_PREFIX}/include
++ /usr/include
++ /usr/local/include
++ /usr/local/ossim/include )
++
++# Find HDF5A library:
++find_library( HDF5A_LIB NAMES hdf5a hdf5
++ PATHS
++ ${CMAKE_INSTALL_PREFIX}/lib64
++ /usr/lib64
++ ${CMAKE_INSTALL_PREFIX}/lib
++ /usr/lib
++ /usr/local/lib
++ /usr/local/ossim/lib )
++
++# Find HDF5A CPP library:
++find_library( HDF5A_CPP_LIB NAMES hdf5a_cpp hdf5_cpp
++ PATHS
++ ${CMAKE_INSTALL_PREFIX}/lib64
++ /usr/lib64
++ ${CMAKE_INSTALL_PREFIX}/lib
++ /usr/lib
++ /usr/local/lib
++ /usr/local/ossim/lib )
++
++# Set the HDF5A_LIBRARIES:
++if( HDF5A_LIB AND HDF5A_CPP_LIB )
++ set( HDF5A_LIBRARIES ${HDF5A_LIB} ${HDF5A_CPP_LIB} CACHE STRING INTERNAL )
++endif(HDF5A_LIB AND HDF5A_CPP_LIB )
++
++#---
++# This function sets HDF5A_FOUND if variables are valid.
++#---
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args( HDF5A DEFAULT_MSG
++ HDF5A_LIBRARIES
++ HDF5A_INCLUDE_DIR )
++
++if( HDF5A_FOUND )
++ if( NOT HDF5A_FIND_QUIETLY )
++ message( STATUS "Found HDF5A..." )
++ endif( NOT HDF5A_FIND_QUIETLY )
++else( HDF5A_FOUND )
++ if( NOT HDF5A_FIND_QUIETLY )
++ message( WARNING "Could not find HDF5A" )
++ endif( NOT HDF5A_FIND_QUIETLY )
++endif( HDF5A_FOUND )
++
++if( NOT HDF5A_FIND_QUIETLY )
++ message( STATUS "HDF5A_INCLUDE_DIR=${HDF5A_INCLUDE_DIR}" )
++ message( STATUS "HDF5A_LIBRARIES=${HDF5A_LIBRARIES}" )
++endif( NOT HDF5A_FIND_QUIETLY )
diff --git a/debian/patches/fftw3.patch b/debian/patches/fftw3.patch
deleted file mode 100644
index 077c90a..0000000
--- a/debian/patches/fftw3.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Use pkg-config for fftw3.
-Author: Bas Couwenberg <sebastic at debian.org>
-
---- a/ossim_plugins/registration/CMakeLists.txt
-+++ b/ossim_plugins/registration/CMakeLists.txt
-@@ -6,15 +6,18 @@ include(OssimVersion)
- include(OssimCommonVariables)
- include(OssimUtilities)
-
--find_package(FFTW3)
-+include(FindPkgConfig)
-+pkg_search_module(FFTW3 fftw3)
-+
-+#find_package(FFTW3)
- #find_package(TIFF)
- #find_package(CURL)
- #find_package(EXPAT)
- #find_library(SQLITE_LIBRARY NAMES sqlite sqlite3)
- #find_library(PROJ4_LIBRARY NAMES proj proj4)
-
--MESSAGE( STATUS "FFTW3_LIBRARY = ${FFTW3_LIBRARY}" )
--MESSAGE( STATUS "FFTW3_INCLUDE = ${FFTW3_INCLUDE_DIR}" )
-+MESSAGE( STATUS "FFTW3_LIBRARY = ${FFTW3_LIBRARIES}" )
-+MESSAGE( STATUS "FFTW3_INCLUDE = ${FFTW3_INCLUDE_DIRS}" )
- #MESSAGE( STATUS "TIFF_LIBRARY = ${TIFF_LIBRARY}" )
- #MESSAGE( STATUS "TIFF_INCLUDE = ${TIFF_INCLUDE_DIR}" )
- #MESSAGE( STATUS "EXPAT_LIBRARY = ${EXPAT_LIBRARY}" )
-@@ -23,7 +26,7 @@ MESSAGE( STATUS "FFTW3_INCLUDE =
-
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
- INCLUDE_DIRECTORIES(${OPENTHREADS_INCLUDE_DIR})
--INCLUDE_DIRECTORIES(${FFTW3_INCLUDE_DIR})
-+INCLUDE_DIRECTORIES(${FFTW3_INCLUDE_DIRS})
- #INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR})
- #INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
-
-@@ -45,7 +48,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} ${FFTW3_LIBRARY}
-+ LIBRARIES ${OSSIM_LIBRARIES} ${OPENTHREADS_LIBRARY} ${FFTW3_LIBRARIES}
- HEADERS "${OSSIMPLUGIN_HEADERS}"
- SOURCE_FILES "${OSSIMPLUGIN_SRCS}"
- INSTALL_LIB)
diff --git a/debian/patches/opencv.patch b/debian/patches/opencv.patch
deleted file mode 100644
index 63e6627..0000000
--- a/debian/patches/opencv.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Use pkg-config for OpenCV.
-Author: Bas Couwenberg <sebastic at debian.org>
-
---- a/ossim_plugins/opencv/CMakeLists.txt
-+++ b/ossim_plugins/opencv/CMakeLists.txt
-@@ -10,7 +10,9 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOUR
-
- SET(requiredLib)
-
--find_package( OpenCV )
-+include(FindPkgConfig)
-+pkg_search_module(OPENCV opencv)
-+
- if( OPENCV_FOUND )
- include_directories( ${OPENCV_INCLUDE_DIR} )
- set( requiredLib ${requiredLib} ${OPENCV_LIBRARIES} )
diff --git a/debian/patches/series b/debian/patches/series
index 3bc1e1f..749c8be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
cmake.patch
-sqlite.patch
libraw.patch
-fftw3.patch
-opencv.patch
gdal.patch
geotiff.patch
diff --git a/debian/patches/sqlite.patch b/debian/patches/sqlite.patch
deleted file mode 100644
index 9c267c3..0000000
--- a/debian/patches/sqlite.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Use pkg-config for sqlite3.
-Author: Bas Couwenberg <sebastic at debian.org>
-
---- a/ossim_plugins/sqlite/CMakeLists.txt
-+++ b/ossim_plugins/sqlite/CMakeLists.txt
-@@ -11,10 +11,12 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOUR
- set(requiredLibs)
-
- # SQLite - Required:
--find_package(SQLITE)
-+include(FindPkgConfig)
-+pkg_search_module(SQLITE sqlite3)
-+
- if(SQLITE_FOUND)
-- include_directories( ${SQLITE_INCLUDE_DIR} )
-- SET(requiredLibs ${requiredLibs} ${SQLITE_LIBRARY})
-+ include_directories( ${SQLITE_INCLUDE_DIRS} )
-+ SET(requiredLibs ${requiredLibs} ${SQLITE_LIBRARIES})
- else(SQLITE_FOUND)
- message(FATAL_ERROR "Could not find sqlite")
- endif(SQLITE_FOUND)
diff --git a/debian/rules b/debian/rules
index 78fd292..a9484d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,9 +26,7 @@ CMAKE_OPTS = \
-DBUILD_OSSIMREGISTRATION_PLUGIN=ON \
-DBUILD_OSSIMSQLITE_PLUGIN=ON \
-DBUILD_OSSIMWEB_PLUGIN=ON \
- -DBUILD_SHARED_LIBS=ON \
- -DPODOFO_INCLUDE_DIR=/usr/include/podofo \
- -DPODOFO_LIBRARY=/usr/lib/libpodofo.so
+ -DBUILD_SHARED_LIBS=ON
override_dh_auto_configure:
dh_auto_configure -- $(CMAKE_OPTS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim-plugins.git
More information about the Pkg-grass-devel
mailing list