[fawkes: 1/2] Added workarounds for v4l2 API and broken graphviz

[rmattes]

commit 66981f36424fad215d91d035c6b7565dc5fcfcf9
Author: Rich Mattes <richmattes at gmail.com>
Date:   Tue Apr 2 18:57:16 2013 -0400

    Added workarounds for v4l2 API and broken graphviz

 fawkes-0.5.0-graphviz.patch  |   17 +++++++++++++++--
 fawkes-0.5.0-v4lkernel.patch |   35 +++++++++++++++++++++++++++++++++++
 fawkes.spec                  |    2 ++
 3 files changed, 52 insertions(+), 2 deletions(-)
---
diff --git a/fawkes-0.5.0-graphviz.patch b/fawkes-0.5.0-graphviz.patch
index c07c9bb..c6b987f 100644
--- a/fawkes-0.5.0-graphviz.patch
+++ b/fawkes-0.5.0-graphviz.patch
@@ -1,6 +1,6 @@
 diff -up ./src/tools/skillgui/batch_render.cpp.graphviz ./src/tools/skillgui/batch_render.cpp
---- ./src/tools/skillgui/batch_render.cpp.graphviz	2013-01-26 23:28:28.819616603 -0500
-+++ ./src/tools/skillgui/batch_render.cpp	2013-01-26 23:28:39.974046493 -0500
+--- ./src/tools/skillgui/batch_render.cpp.graphviz	2012-09-26 18:55:32.000000000 -0400
++++ ./src/tools/skillgui/batch_render.cpp	2013-04-02 18:04:50.778425089 -0400
 @@ -215,7 +215,7 @@ class SkillGuiBatchRenderer
    {
  
@@ -10,3 +10,16 @@ diff -up ./src/tools/skillgui/batch_render.cpp.graphviz ./src/tools/skillgui/bat
      if (g) {
        gvLayout(gvc, g, (char *)"dot");
        gvRender(gvc, g, (char *)"skillguicairo", NULL);
+diff -up ./src/tools/skillgui/Makefile.graphviz ./src/tools/skillgui/Makefile
+--- ./src/tools/skillgui/Makefile.graphviz	2013-04-02 18:37:37.299752601 -0400
++++ ./src/tools/skillgui/Makefile	2013-04-02 18:38:20.275457771 -0400
+@@ -44,7 +44,8 @@ ifneq ($(PKGCONFIG),)
+   endif
+   ifeq ($(HAVE_GRAPHVIZ),1)
+     CFLAGS_GRAPHVIZ = $(shell $(PKGCONFIG) --cflags 'libgvc') -DWITH_CODEGENS
+-    LDFLAGS_GRAPHVIZ = $(shell $(PKGCONFIG) --libs 'libgvc')
++    LDFLAGS_GRAPHVIZ = -lgvc -lcgraph -lcdt
++#    LDFLAGS_GRAPHVIZ = $(shell $(PKGCONFIG) --libs 'libgvc')
+   endif
+ endif
+ 
diff --git a/fawkes-0.5.0-v4lkernel.patch b/fawkes-0.5.0-v4lkernel.patch
new file mode 100644
index 0000000..e529e20
--- /dev/null
+++ b/fawkes-0.5.0-v4lkernel.patch
@@ -0,0 +1,35 @@
+diff -up ./src/libs/fvcams/v4l2.cpp.v4lkernel ./src/libs/fvcams/v4l2.cpp
+--- ./src/libs/fvcams/v4l2.cpp.v4lkernel	2013-04-02 18:05:31.081079502 -0400
++++ ./src/libs/fvcams/v4l2.cpp	2013-04-02 18:21:04.899403651 -0400
+@@ -1551,27 +1551,27 @@ V4L2Camera::set_fps(unsigned int fps)
+ unsigned int
+ V4L2Camera::lens_x_corr()
+ {
+-  return get_one_control("lens x", V4L2_CID_HCENTER/*_DEPRECATED*/);
++  return get_one_control("lens x", V4L2_CID_PAN_RESET);
+ }
+ 
+ unsigned int
+ V4L2Camera::lens_y_corr()
+ {
+-  return get_one_control("lens y", V4L2_CID_VCENTER/*_DEPRECATED*/);
++  return get_one_control("lens y", V4L2_CID_TILT_RESET);
+ }
+ 
+ void
+ V4L2Camera::set_lens_x_corr(unsigned int x_corr)
+ {
+   LibLogger::log_debug("V4L2Cam", "Setting horizontal lens correction to %d", x_corr);
+-  set_one_control("lens x", V4L2_CID_HCENTER/*_DEPRECATED*/, x_corr);
++  set_one_control("lens x", V4L2_CID_PAN_RESET, x_corr);
+ }
+ 
+ void
+ V4L2Camera::set_lens_y_corr(unsigned int y_corr)
+ {
+   LibLogger::log_debug("V4L2Cam", "Setting vertical lens correction to %d", y_corr);
+-  set_one_control("lens x", V4L2_CID_VCENTER/*_DEPRECATED*/, y_corr);
++  set_one_control("lens x", V4L2_CID_TILT_RESET, y_corr);
+ }
+ 
+ 
diff --git a/fawkes.spec b/fawkes.spec
index 3276e3e..f19314c 100644
--- a/fawkes.spec
+++ b/fawkes.spec
@@ -10,6 +10,7 @@ Source0:        http://files.fawkesrobotics.org/releases/%{name}-%{version}.tar.
 # The agread function in graphviz 2.30.0 has a new second argument, a callback.
 # This patch adds the new argument in calls to agread
 Patch0:         %{name}-0.5.0-graphviz.patch
+Patch1:         %{name}-0.5.0-v4lkernel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-c++, make >= 3.81
@@ -456,6 +457,7 @@ functionality.
 %setup -q
 %if 0%{?fedora} >= 19
 %patch0 -p0 -b .graphviz
+%patch1 -p0 -b .v4lkernel
 %endif
 
 %build