[gstreamer-plugins-good] Blindly stab at the v4l2 code until it emits binaries

Colin Walters walters at fedoraproject.org
Thu May 2 20:30:39 UTC 2013


commit 661f25369008df73e304b56ac174548e078a3ba2
Author: Colin Walters <walters at verbum.org>
Date:   Thu May 2 16:30:32 2013 -0400

    Blindly stab at the v4l2 code until it emits binaries

 0001-sys-v4l2-Some-blind-compilation-fixes.patch |   57 ++++++++++++++++++++++
 gstreamer-plugins-good.spec                      |    7 ++-
 2 files changed, 63 insertions(+), 1 deletions(-)
---
diff --git a/0001-sys-v4l2-Some-blind-compilation-fixes.patch b/0001-sys-v4l2-Some-blind-compilation-fixes.patch
new file mode 100644
index 0000000..e03fdac
--- /dev/null
+++ b/0001-sys-v4l2-Some-blind-compilation-fixes.patch
@@ -0,0 +1,57 @@
+From fa21c0bb253213c9dc48ce72faaf7090dc8a3554 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters at verbum.org>
+Date: Thu, 2 May 2013 16:16:46 -0400
+Subject: [PATCH] sys/v4l2: Some blind compilation fixes
+
+---
+ sys/v4l2/gstv4l2bufferpool.c |    1 -
+ sys/v4l2/v4l2_calls.c        |   12 ++++--------
+ 2 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
+index a0b4c84..3916815 100644
+--- a/sys/v4l2/gstv4l2bufferpool.c
++++ b/sys/v4l2/gstv4l2bufferpool.c
+@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
+     GST_LOG_OBJECT (pool->v4l2elem, "  MMAP offset:  %u",
+         ret->vbuffer.m.offset);
+   GST_LOG_OBJECT (pool->v4l2elem, "  length:    %u", ret->vbuffer.length);
+-  GST_LOG_OBJECT (pool->v4l2elem, "  input:     %u", ret->vbuffer.input);
+ 
+   ret->mmap_length = ret->vbuffer.length;
+   data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
+diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
+index 309bfb6..ee3ff9f 100644
+--- a/sys/v4l2/v4l2_calls.c
++++ b/sys/v4l2/v4l2_calls.c
+@@ -53,14 +53,6 @@
+ 
+ #include "gst/gst-i18n-plugin.h"
+ 
+-/* Those are ioctl calls */
+-#ifndef V4L2_CID_HCENTER
+-#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED
+-#endif
+-#ifndef V4L2_CID_VCENTER
+-#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED
+-#endif
+-
+ GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
+ #define GST_CAT_DEFAULT v4l2_debug
+ 
+@@ -294,8 +286,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
+         break;
+       case V4L2_CID_HFLIP:
+       case V4L2_CID_VFLIP:
++#ifdef V4L2_CID_HCENTER
+       case V4L2_CID_HCENTER:
++#endif
++#ifdef V4L2_CID_VCENTER
+       case V4L2_CID_VCENTER:
++#endif
+ #ifdef V4L2_CID_PAN_RESET
+       case V4L2_CID_PAN_RESET:
+ #endif
+-- 
+1.7.1
+
diff --git a/gstreamer-plugins-good.spec b/gstreamer-plugins-good.spec
index 206f1b2..dd23796 100644
--- a/gstreamer-plugins-good.spec
+++ b/gstreamer-plugins-good.spec
@@ -13,7 +13,7 @@
 
 Name:           %{gstreamer}-plugins-good
 Version:        0.10.31
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        GStreamer plug-ins with good code and licensing
 
 Group:          Applications/Multimedia
@@ -28,6 +28,7 @@ Patch2:         0002-clear_DISCONT_flag.patch
 Patch3:         0003-v4l2src-fix.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=677722
 Patch4:         0004-v4l2object-Don-t-probe-UVC-devices-for-being-interla.patch
+Patch5:         0001-sys-v4l2-Some-blind-compilation-fixes.patch
 
 Requires:       %{gstreamer} >= %{_gst}
 Requires(pre): GConf2 
@@ -144,6 +145,7 @@ which are not used very much and require additional libraries to be installed.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 
@@ -295,6 +297,9 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{maj
 
 %changelog
 * Thu May 02 2013 Colin Walters <walters at verbum.org>
+- Blindly stab at the v4l2 code until it emits binaries
+
+* Thu May 02 2013 Colin Walters <walters at verbum.org>
 - Drop PyXML dependency (rhbz#914060)
 
 * Wed Mar 27 2013 Adam Jackson <ajax at redhat.com>


More information about the scm-commits mailing list