Author: johnp
Update of /cvs/extras/rpms/gstreamer-plugins-good/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15417
Modified Files:
gstreamer-plugins-good.spec
Added Files:
gst-v4l2-nointerlace.patch
Log Message:
- remove esound requirement
- add GConf-dbus requirement
- rebuild for olpc2
gst-v4l2-nointerlace.patch:
--- NEW FILE gst-v4l2-nointerlace.patch ---
--- gst-plugins-good-0.10.4.1/sys/v4l2/v4l2src_calls.c.interlace 2006-11-09 16:01:45.000000000 -0500
+++ gst-plugins-good-0.10.4.1/sys/v4l2/v4l2src_calls.c 2006-11-09 16:02:19.000000000 -0500
@@ -292,7 +292,7 @@
v4l2src->format.fmt.pix.width = *width;
v4l2src->format.fmt.pix.height = *height;
v4l2src->format.fmt.pix.pixelformat = fmt->pixelformat;
- v4l2src->format.fmt.pix.field = V4L2_FIELD_INTERLACED;
+ v4l2src->format.fmt.pix.field = V4L2_FIELD_ANY;
v4l2src->format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
if (ioctl (v4l2src->v4l2object->video_fd, VIDIOC_S_FMT, &v4l2src->format) < 0)
@@ -690,7 +690,7 @@
fmt.fmt.pix.width = 0;
fmt.fmt.pix.height = 0;
fmt.fmt.pix.pixelformat = format->pixelformat;
- fmt.fmt.pix.field = V4L2_FIELD_INTERLACED;
+ fmt.fmt.pix.field = V4L2_FIELD_ANY;
if (ioctl (v4l2src->v4l2object->video_fd, VIDIOC_TRY_FMT, &fmt) < 0) {
GST_DEBUG_OBJECT (v4l2src, "failed to get min size: %s",
g_strerror (errno));
Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-plugins-good/OLPC-2/gstreamer-plugins-good.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gstreamer-plugins-good.spec 7 May 2007 12:38:25 -0000 1.34
+++ gstreamer-plugins-good.spec 15 Jun 2007 03:50:15 -0000 1.35
@@ -6,7 +6,7 @@
Name: %{gstreamer}-plugins-good
Version: 0.10.5
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: GStreamer plug-ins with good code and licensing
Group: Applications/Multimedia
@@ -15,12 +15,13 @@
Source: http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.bz2
Patch0: gst-plugins-good-0.10.4-docs.patch
Patch1: gst-plugins-good-0.10.5-flac.patch
+Patch2: gst-v4l2-nointerlace.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{gstreamer} >= %{_gst}
-Requires(pre): GConf2
-Requires(preun): GConf2
-Requires(post): GConf2
+Requires(pre): GConf2-dbus
+Requires(preun): GConf2-dbus
+Requires(post): GConf2-dbus
Requires: gstreamer-plugins-base
# superceded by the package above and ourselves
Obsoletes: gstreamer-plugins
@@ -37,9 +38,8 @@
BuildRequires: cairo-devel
# cairo pulls in Xrender, but -devel has a missing dep on libX11-devel
BuildRequires: libX11-devel
-BuildRequires: esound-devel >= 0.2.8
BuildRequires: flac-devel >= 1.1.3
-BuildRequires: GConf2-devel
+BuildRequires: GConf2-dbus-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel >= 1.2.0
BuildRequires: mikmod
@@ -97,15 +97,17 @@
%setup -q -n gst-plugins-good-%{version}
%patch0 -p1 -b .docs
%patch1 -p1 -b .flac
+%patch2 -p1 -b .nointerlace
%build
autoreconf
%configure \
--with-package-name='Fedora Core gstreamer-plugins-good package' \
- --with-package-origin='http://download.fedora.redhat.com/fedora'
+ --with-package-origin='http://download.fedora.redhat.com/fedora' \
+ --enable-experimental
make %{?_smp_mflags}
-
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -162,11 +164,11 @@
%{_libdir}/gstreamer-%{majorminor}/libgsticydemux.so
%{_libdir}/gstreamer-%{majorminor}/libgstvideobalance.so
%{_libdir}/gstreamer-%{majorminor}/libgstximagesrc.so
+%{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux2.so
# gstreamer-plugins with external dependencies but in the main package
#%{_libdir}/gstreamer-%{majorminor}/libgstcacasink.so
%{_libdir}/gstreamer-%{majorminor}/libgstcairo.so
-%{_libdir}/gstreamer-%{majorminor}/libgstesd.so
%{_libdir}/gstreamer-%{majorminor}/libgstflac.so
%{_libdir}/gstreamer-%{majorminor}/libgstgdkpixbuf.so
%{_libdir}/gstreamer-%{majorminor}/libgsthalelements.so
@@ -215,6 +217,11 @@
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
%changelog
+* Thu Jun 14 2007 John (J5) Palmieri <johnp at redhat.com> - 0.10.5-7
+- remove esound requirement
+- add GConf-dbus requirement
+- rebuild for olpc2
+
* Sat May 5 2007 Matthias Clasen <mclasen at redhat.com> - 0.10.5-6
- Add libshout-devel, taglib-devel, libcdio-devel as BRs (#136268)