Update to 0.11.94.
Drop v4l2-buffer patch. Fixed upstream.
This commit is contained in:
parent
01e3994664
commit
e88847d6b7
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
/gst-plugins-good-0.11.93.tar.xz
|
/gst-plugins-good-0.11.93.tar.xz
|
||||||
|
/gst-plugins-good-0.11.94.tar.xz
|
||||||
|
@ -1,34 +0,0 @@
|
|||||||
From 9f2aa8d47f835ea155aaf635f618c0fc1ca87012 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Matthias Clasen <mclasen@redhat.com>
|
|
||||||
Date: Thu, 09 Aug 2012 07:35:23 +0000
|
|
||||||
Subject: v4l2: fix build with recent kernels, the v4l2_buffer input field was removed
|
|
||||||
|
|
||||||
This was unused apparently and removed in the kernel in commit:
|
|
||||||
|
|
||||||
From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Sakari Ailus <sakari.ailus@iki.fi>
|
|
||||||
Date: Wed, 2 May 2012 09:40:03 -0300
|
|
||||||
Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT
|
|
||||||
|
|
||||||
Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which
|
|
||||||
tells the former is valid. The flag is used by no driver currently.
|
|
||||||
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=681491
|
|
||||||
|
|
||||||
Conflicts:
|
|
||||||
sys/v4l2/gstv4l2bufferpool.c
|
|
||||||
---
|
|
||||||
diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
|
|
||||||
index d040d9d..897231d 100644
|
|
||||||
--- a/sys/v4l2/gstv4l2bufferpool.c
|
|
||||||
+++ b/sys/v4l2/gstv4l2bufferpool.c
|
|
||||||
@@ -175,7 +175,6 @@ gst_v4l2_buffer_pool_alloc_buffer (GstBufferPool * bpool, GstBuffer ** buffer,
|
|
||||||
if (meta->vbuffer.memory == V4L2_MEMORY_MMAP)
|
|
||||||
GST_LOG_OBJECT (pool, " MMAP offset: %u", meta->vbuffer.m.offset);
|
|
||||||
GST_LOG_OBJECT (pool, " length: %u", meta->vbuffer.length);
|
|
||||||
- GST_LOG_OBJECT (pool, " input: %u", meta->vbuffer.input);
|
|
||||||
|
|
||||||
meta->mem = v4l2_mmap (0, meta->vbuffer.length,
|
|
||||||
PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd,
|
|
||||||
--
|
|
||||||
cgit v0.9.0.2-2-gbebe
|
|
@ -8,14 +8,13 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: gstreamer1-plugins-good
|
Name: gstreamer1-plugins-good
|
||||||
Version: 0.11.93
|
Version: 0.11.94
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: GStreamer plugins with good code and licensing
|
Summary: GStreamer plugins with good code and licensing
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://gstreamer.freedesktop.org/
|
URL: http://gstreamer.freedesktop.org/
|
||||||
Source0: http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.xz
|
Source0: http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.xz
|
||||||
Patch0: drop-v4l2-buffer-input.patch
|
|
||||||
|
|
||||||
BuildRequires: gstreamer1-devel >= %{version}
|
BuildRequires: gstreamer1-devel >= %{version}
|
||||||
BuildRequires: gstreamer1-plugins-base-devel >= %{version}
|
BuildRequires: gstreamer1-plugins-base-devel >= %{version}
|
||||||
@ -83,7 +82,6 @@ to be installed.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n gst-plugins-good-%{version}
|
%setup -q -n gst-plugins-good-%{version}
|
||||||
%patch0 -p1 -b .buffer
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -198,6 +196,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Sep 14 2012 Brian Pepple <bpepple@fedoraproject.org> - 0.11.94-1
|
||||||
|
- Update to 0.11.94.
|
||||||
|
- Drop v4l2-buffer patch. Fixed upstream.
|
||||||
|
|
||||||
* Wed Aug 15 2012 Brian Pepple <bpepple@fedoraproject.org> - 0.11.93-1
|
* Wed Aug 15 2012 Brian Pepple <bpepple@fedoraproject.org> - 0.11.93-1
|
||||||
- Update to 0.11.93.
|
- Update to 0.11.93.
|
||||||
- Add batch to fix build with recent kernels, the v4l2_buffer input field was removed.
|
- Add batch to fix build with recent kernels, the v4l2_buffer input field was removed.
|
||||||
|
Loading…
Reference in New Issue
Block a user