[rpms/pcl] f44: Add patch to remove openni-dev from pkgconfig files (rhbz#1007941)

[rpms/pcl] f44: Add patch to remove openni-dev from pkgconfig files (rhbz#1007941)

[Rich Mattes]

            A new commit has been pushed.

            Repo   : rpms/pcl
            Branch : f44
            Commit : b9c07d29a2716abc4df68b4a982aef30d69f0b2d
            Author : Rich Mattes <richmattes@gmail.com>
            Date   : 2013-09-14T13:07:56-04:00
            Stats  : +133/-2 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/pcl/c/b9c07d29a2716abc4df68b4a982aef30d69f0b2d?branch=f44

            Log:
            Add patch to remove openni-dev from pkgconfig files (rhbz#1007941)

- Add patch to generate pcl_geometry pkgconfig file again

---
diff --git a/pcl-1.7.0-geometrypkgconfig.patch b/pcl-1.7.0-geometrypkgconfig.patch
new file mode 100644
index 0000000..17d4f00
--- /dev/null
+++ b/pcl-1.7.0-geometrypkgconfig.patch
@@ -0,0 +1,97 @@
+From e1d3505d4a6743de05a4baf9ec66bfec2f9e5b01 Mon Sep 17 00:00:00 2001
+From: jdt141 <justin.d.teems@gmail.com>
+Date: Sun, 8 Sep 2013 22:22:06 -0400
+Subject: [PATCH] Addition of pkg-config header only file generation for
+ geometry lib
+
+---
+ cmake/pcl_targets.cmake             | 33 +++++++++++++++++++++++++++++++++
+ cmake/pkgconfig-headeronly.cmake.in | 12 ++++++++++++
+ geometry/CMakeLists.txt             |  6 +++---
+ 3 files changed, 48 insertions(+), 3 deletions(-)
+ create mode 100644 cmake/pkgconfig-headeronly.cmake.in
+
+diff --git a/cmake/pcl_targets.cmake b/cmake/pcl_targets.cmake
+index 8a5e343..1f7c2b5 100644
+--- a/cmake/pcl_targets.cmake
++++ b/cmake/pcl_targets.cmake
+@@ -454,6 +454,39 @@ macro(PCL_MAKE_PKGCONFIG _name _component _desc _pcl_deps _ext_deps _int_deps _c
+         COMPONENT pcl_${_component})
+ endmacro(PCL_MAKE_PKGCONFIG)
+ 
++###############################################################################
++# Make a pkg-config file for a header-only library. 
++# Essentially a duplicate of PCL_MAKE_PKGCONFIG, but 
++# ensures that no -L or l flags will be created
++# Do not include general PCL stuff in the
++# arguments; they will be added automaticaly.
++# _name The library name. "pcl_" will be preprended to this.
++# _component The part of PCL that this pkg-config file belongs to.
++# _desc Description of the library.
++# _pcl_deps External dependencies to pcl libs, as a list. (will get mangled to external pkg-config name)
++# _ext_deps External dependencies, as a list.
++# _int_deps Internal dependencies, as a list.
++# _cflags Compiler flags necessary to build with the library.
++macro(PCL_MAKE_PKGCONFIG_HEADER_ONLY _name _component _desc _pcl_deps _ext_deps _int_deps _cflags)
++set(PKG_NAME ${_name})
++set(PKG_DESC ${_desc})
++set(PKG_CFLAGS ${_cflags})
++#set(PKG_LIBFLAGS ${_lib_flags})
++LIST_TO_STRING(_ext_deps_str "${_ext_deps}")
++set(PKG_EXTERNAL_DEPS ${_ext_deps_str})
++foreach(_dep ${_pcl_deps})
++set(PKG_EXTERNAL_DEPS "${PKG_EXTERNAL_DEPS} pcl_${_dep}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}")
++endforeach(_dep)
++set(PKG_INTERNAL_DEPS "")
++foreach(_dep ${_int_deps})
++set(PKG_INTERNAL_DEPS "${PKG_INTERNAL_DEPS} -l${_dep}")
++endforeach(_dep)
++set(_pc_file ${CMAKE_CURRENT_BINARY_DIR}/${_name}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}.pc)
++configure_file(${PROJECT_SOURCE_DIR}/cmake/pkgconfig-headeronly.cmake.in ${_pc_file} @ONLY)
++install(FILES ${_pc_file} DESTINATION ${PKGCFG_INSTALL_DIR}
++COMPONENT pcl_${_component})
++endmacro(PCL_MAKE_PKGCONFIG_HEADER_ONLY)
++
+ 
+ ###############################################################################
+ # PRIVATE
+diff --git a/cmake/pkgconfig-headeronly.cmake.in b/cmake/pkgconfig-headeronly.cmake.in
+new file mode 100644
+index 0000000..6359f03
+--- /dev/null
++++ b/cmake/pkgconfig-headeronly.cmake.in
+@@ -0,0 +1,12 @@
++# This file was generated by CMake for @PROJECT_NAME@ library @PKG_NAME@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${prefix}/@LIB_INSTALL_DIR@
++#includedir=${prefix}/@INCLUDE_INSTALL_DIR@
++includedir=${prefix}/include/@PROJECT_NAME_LOWER@-@PCL_MAJOR_VERSION@.@PCL_MINOR_VERSION@
++Name: @PKG_NAME@
++Description: @PKG_DESC@
++Version: @PCL_VERSION@
++Requires: @PKG_EXTERNAL_DEPS@
++Libs: 
++Cflags: -I${includedir} @PKG_CFLAGS@
+diff --git a/geometry/CMakeLists.txt b/geometry/CMakeLists.txt
+index ec387a6..ec8d9d3 100644
+--- a/geometry/CMakeLists.txt
++++ b/geometry/CMakeLists.txt
+@@ -37,11 +37,11 @@ if(build)
+ #      src/geometry.cpp
+ #     )
+ 
+-#  set(LIB_NAME pcl_${SUBSYS_NAME})
++set(LIB_NAME pcl_${SUBSYS_NAME})
+   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+-#  PCL_ADD_LIBRARY(${LIB_NAME} ${SUBSYS_NAME} ${srcs} ${incs} ${impl_incs})
++# PCL_ADD_LIBRARY(${LIB_NAME} ${SUBSYS_NAME} ${srcs} ${incs} ${impl_incs})
+ #  target_link_libraries(${LIB_NAME} pcl_common)
+-#  PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "" "" "" "")
++PCL_MAKE_PKGCONFIG_HEADER_ONLY(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "" "" "")
+ 
+   # Install include files
+   PCL_ADD_INCLUDES(${SUBSYS_NAME} ${SUBSYS_NAME} ${incs})
+-- 
+1.8.4
+

diff --git a/pcl-1.7.0-opennidev.patch b/pcl-1.7.0-opennidev.patch
new file mode 100644
index 0000000..4b4367e
--- /dev/null
+++ b/pcl-1.7.0-opennidev.patch
@@ -0,0 +1,24 @@
+diff -up ./io/CMakeLists.txt.opennidev ./io/CMakeLists.txt
+--- ./io/CMakeLists.txt.opennidev	2013-09-14 12:21:16.274813752 -0400
++++ ./io/CMakeLists.txt	2013-09-14 12:21:21.485017759 -0400
+@@ -236,7 +236,7 @@ if(build)
+ 
+     set(EXT_DEPS eigen3)
+     if(OPENNI_FOUND)
+-      list(APPEND EXT_DEPS openni-dev)
++      #list(APPEND EXT_DEPS openni-dev)
+     endif(OPENNI_FOUND)
+     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
+       "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")
+diff -up ./visualization/CMakeLists.txt.opennidev ./visualization/CMakeLists.txt
+--- ./visualization/CMakeLists.txt.opennidev	2013-09-14 12:21:24.992155022 -0400
++++ ./visualization/CMakeLists.txt	2013-09-14 12:21:43.830891570 -0400
+@@ -160,7 +160,7 @@ if(build)
+ 
+     set(EXT_DEPS "")
+     if(OPENNI_FOUND)
+-      list(APPEND EXT_DEPS openni-dev)
++      #list(APPEND EXT_DEPS openni-dev)
+     endif(OPENNI_FOUND)
+     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
+       "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")

diff --git a/pcl.spec b/pcl.spec
index 5c8499d..620c017 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -2,7 +2,7 @@
 
 Name:           pcl
 Version:        1.7.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library for point cloud processing
 
 Group:          System Environment/Libraries
@@ -15,7 +15,11 @@ Patch0:         %{name}-vtk6.patch
 Patch1:         %{name}-1.7.0-metslib.patch
 # Patch for PCLConfig.cmake to find pcl
 Patch2:         %{name}-1.7.0-fedora.patch
-
+# Add pkgconfig for pcl_geometry.
+# https://github.com/PointCloudLibrary/pcl/commit/e1d3505d4a6743de05a4baf9ec66bfec2f9e5b01.patch
+Patch3:         %{name}-1.7.0-geometrypkgconfig.patch
+# Stops openni-dev from being added to pkgconfig files (rhbz#1007941)
+Patch4:         %{name}-1.7.0-opennidev.patch
 # For plain building
 BuildRequires:  cmake, gcc-c++, boost-devel
 # Documentation
@@ -84,6 +88,8 @@ Library.
 %patch0 -p1 -b .vtk6
 %patch1 -p0 -b .metslib
 %patch2 -p0 -b .fedora
+%patch3 -p1
+%patch4 -p0 
 # Just to make it obvious we're not using any of these
 rm -fr recognition/include/pcl/recognition/3rdparty/metslib
 rm -fr surface/src/3rdparty/opennurbs
@@ -197,6 +203,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{apiversion}
 
 
 %changelog
+* Sat Sep 14 2013 Rich Mattes <richmattes@gmail.com> - 1.7.0-4
+- Add patch to remove openni-dev from pkgconfig files (rhbz#1007941)
+- Add patch to generate pcl_geometry pkgconfig file again
+
 * Sun Sep 08 2013 Rich Mattes <richmattes@gmail.com> - 1.7.0-3
 - Fix hard-coded vtk library dependencies in PCLConfig.cmake