[packages/vrpn] - added jsoncpp patch - use system hidapi and jsoncpp libraries

[qboosh]

commit 856622614709e856f7db0f340a01eea92c0f84c8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 27 10:25:16 2014 +0100

    - added jsoncpp patch
    - use system hidapi and jsoncpp libraries

 vrpn-jsoncpp.patch | 33 +++++++++++++++++++++++++++++++++
 vrpn.spec          |  7 ++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
---
diff --git a/vrpn.spec b/vrpn.spec
index f99352c..46f073b 100644
--- a/vrpn.spec
+++ b/vrpn.spec
@@ -19,12 +19,14 @@ Group:		Libraries
 Source0:	http://www.cs.unc.edu/Research/vrpn/downloads/%{name}_%{fver}.zip
 # Source0-md5:	6cb32e51e6420385f2006f1aae58b457
 Patch0:		%{name}-install.patch
+Patch1:		%{name}-jsoncpp.patch
 URL:		http://www.cs.unc.edu/Research/vrpn/
 BuildRequires:	cmake >= 2.8.3
 %{?with_apidocs:BuildRequires:	doxygen}
 %{?with_gpm:BuildRequires:	gpm-devel}
+BuildRequires:	hidapi-devel >= 0.7.0
 BuildRequires:	jdk
-BuildRequires:	jsoncpp-devel
+BuildRequires:	jsoncpp-devel >= 0.7.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libusb-devel >= 1.0
 %{?with_mpi:BuildRequires:	mpi-devel}
@@ -115,6 +117,7 @@ Wiązania Pythona do bibliotek VRPN.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
@@ -123,6 +126,8 @@ cd build
 	-DSYSCONF_INSTALL_DIR=%{_sysconfdir}/vrpn \
 	%{?with_gpl:-DVRPN_GPL_SERVER=ON} \
 	-DVRPN_USE_GPM_MOUSE=%{?with_gpm:ON}%{!?with_gpm:OFF} \
+	-DVRPN_USE_LOCAL_HIDAPI=OFF \
+	-DVRPN_USE_LOCAL_JSONCPP=OFF \
 	-DVRPN_USE_MPI=%{?with_mpi:ON}%{!?with_mpi:OFF} \
 	-DVRPN_BUILD_PYTHON=ON
 
diff --git a/vrpn-jsoncpp.patch b/vrpn-jsoncpp.patch
new file mode 100644
index 0000000..0d6c2d5
--- /dev/null
+++ b/vrpn-jsoncpp.patch
@@ -0,0 +1,33 @@
+--- vrpn/vrpn_Tracker_JsonNet.C.orig	2014-11-15 20:29:38.000000000 +0100
++++ vrpn/vrpn_Tracker_JsonNet.C	2014-12-26 12:45:58.731261102 +0100
+@@ -16,7 +16,7 @@
+ 	#define INVALID_SOCKET -1
+ #endif
+ 
+-#include "json/json.h"
++#include <jsoncpp/json.h>
+ 
+ #include "quat.h"
+ 
+--- vrpn/cmake/FindJsonCpp.cmake.orig	2014-11-15 20:29:36.000000000 +0100
++++ vrpn/cmake/FindJsonCpp.cmake	2014-12-27 09:48:50.844747877 +0100
+@@ -21,8 +21,9 @@
+ 	CACHE
+ 	PATH
+ 	"Directory to search for JSONCPP")
+-set(_jsoncppnames)
++set(_jsoncppnames jsoncpp)
+ set(_pathsuffixes
++	lib${LIB_SUFFIX}
+ 	suncc
+ 	vacpp
+ 	mingw
+@@ -77,7 +78,7 @@
+ 
+ find_path(JSONCPP_INCLUDE_DIR
+ 	NAMES
+-	json/json.h
++	jsoncpp/json.h
+ 	PATHS
+ 	"${JSONCPP_ROOT_DIR}"
+ 	PATH_SUFFIXES
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vrpn.git/commitdiff/856622614709e856f7db0f340a01eea92c0f84c8