rpms/gstreamer-plugins-good/devel gst-plugins-good-v4l2-new-kernel.patch, NONE, 1.1 gstreamer-plugins-good.spec, 1.57, 1.58
Bastien Nocera (hadess)
fedora-extras-commits at redhat.com
Tue Jun 3 10:17:34 UTC 2008
Author: hadess
Update of /cvs/pkgs/rpms/gstreamer-plugins-good/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3758
Modified Files:
gstreamer-plugins-good.spec
Added Files:
gst-plugins-good-v4l2-new-kernel.patch
Log Message:
* Tue Jun 03 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.8-5
- Fix compilation of the v4l2 plugin with newer kernels
gst-plugins-good-v4l2-new-kernel.patch:
--- NEW FILE gst-plugins-good-v4l2-new-kernel.patch ---
Index: gstv4l2vidorient.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/sys/v4l2/gstv4l2vidorient.c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 gstv4l2vidorient.c
--- gstv4l2vidorient.c 26 Sep 2006 14:17:54 -0000 1.2
+++ gstv4l2vidorient.c 2 Jun 2008 20:29:15 -0000
@@ -34,6 +34,14 @@
GST_DEBUG_CATEGORY_STATIC (v4l2vo_debug);
#define GST_CAT_DEFAULT v4l2vo_debug
+/* Those are deprecated calls that have been replaced */
+#ifndef V4L2_CID_HCENTER
+#define V4L2_CID_HCENTER V4L2_CID_PAN_RESET
+#endif
+#ifndef V4L2_CID_VCENTER
+#define V4L2_CID_VCENTER V4L2_CID_TILT_RESET
+#endif
+
void
gst_v4l2_video_orientation_interface_init (GstVideoOrientationInterface * klass)
{
Index: v4l2_calls.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/sys/v4l2/v4l2_calls.c,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 v4l2_calls.c
--- v4l2_calls.c 31 Jan 2008 16:12:28 -0000 1.44
+++ v4l2_calls.c 2 Jun 2008 20:29:15 -0000
@@ -45,6 +45,14 @@
#include "gstv4l2src.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
@@ -267,6 +275,8 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l
case V4L2_CID_VFLIP:
case V4L2_CID_HCENTER:
case V4L2_CID_VCENTER:
+ case V4L2_CID_PAN_RESET:
+ case V4L2_CID_TILT_RESET:
/* not handled here, handled by VideoOrientation interface */
control.id++;
break;
Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gstreamer-plugins-good.spec 2 Jun 2008 09:40:09 -0000 1.57
+++ gstreamer-plugins-good.spec 3 Jun 2008 10:16:39 -0000 1.58
@@ -6,7 +6,7 @@
Name: %{gstreamer}-plugins-good
Version: 0.10.8
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: GStreamer plug-ins with good code and licensing
Group: Applications/Multimedia
@@ -14,6 +14,8 @@
URL: http://gstreamer.freedesktop.org/
Source: http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.bz2
Patch0: gst-plugins-good-0.10.8-docs.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=536317
+Patch1: gst-plugins-good-v4l2-new-kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{gstreamer} >= %{_gst}
@@ -94,6 +96,9 @@
%prep
%setup -q -n gst-plugins-good-%{version}
%patch0 -p1 -b .docs
+pushd sys/v4l2
+%patch1 -p0 -b .new-kernel
+popd
%build
@@ -235,6 +240,9 @@
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
%changelog
+* Tue Jun 03 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.8-5
+- Fix compilation of the v4l2 plugin with newer kernels
+
* Mon Jun 02 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.8-4
- Work-around bug that would set the default audio output to "GOOM!"
See http://bugzilla.gnome.org/show_bug.cgi?id=532295
More information about the scm-commits
mailing list