rpms/gstreamer-plugins-good/devel .cvsignore, 1.12, 1.13 gst-plugins-good-0.10.9-libv4l.patch, 1.3, 1.4 gstreamer-plugins-good.spec, 1.76, 1.77 sources, 1.12, 1.13 gst-plugins-good-0.10.8-speex-nego.patch, 1.1, NONE gst-plugins-good-0.10.8-v4l2-progressive-fix.patch, 1.1, NONE gst-plugins-good-v4l2-new-kernel.patch, 1.1, NONE
Bastien Nocera
hadess at fedoraproject.org
Sat Oct 25 00:19:19 UTC 2008
- Previous message (by thread): rpms/kernel/devel patch-2.6.27.4-rc3.bz2.sign, NONE, 1.1 .cvsignore, 1.950, 1.951 TODO, 1.26, 1.27 kernel.spec, 1.1080, 1.1081 linux-2.6-upstream-reverts.patch, 1.3, 1.4 sources, 1.912, 1.913 upstream, 1.824, 1.825 linux-2.6-x86-acpi-fix-resume-on-64-bit-UP-systems.patch, 1.1, NONE
- Next message (by thread): rpms/lyx/devel lyx-1.6.0-xdg_open.patch, NONE, 1.1 lyx.spec, 1.80, 1.81 lyx-1.5.4-xdg_open.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: hadess
Update of /cvs/pkgs/rpms/gstreamer-plugins-good/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18904
Modified Files:
.cvsignore gst-plugins-good-0.10.9-libv4l.patch
gstreamer-plugins-good.spec sources
Removed Files:
gst-plugins-good-0.10.8-speex-nego.patch
gst-plugins-good-0.10.8-v4l2-progressive-fix.patch
gst-plugins-good-v4l2-new-kernel.patch
Log Message:
* Sat Oct 25 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-1
- Update to 0.10.11
- Update libv4l patch
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 27 Aug 2008 08:18:53 -0000 1.12
+++ .cvsignore 25 Oct 2008 00:18:49 -0000 1.13
@@ -1 +1 @@
-gst-plugins-good-0.10.10.tar.bz2
+gst-plugins-good-0.10.11.tar.bz2
gst-plugins-good-0.10.9-libv4l.patch:
Index: gst-plugins-good-0.10.9-libv4l.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gst-plugins-good-0.10.9-libv4l.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gst-plugins-good-0.10.9-libv4l.patch 5 Oct 2008 13:56:17 -0000 1.3
+++ gst-plugins-good-0.10.9-libv4l.patch 25 Oct 2008 00:18:49 -0000 1.4
@@ -277,14 +277,156 @@
/* simple check whether the device is open */
#define GST_V4L2_IS_OPEN(v4l2object) \
-Index: sys/v4l2/v4l2src_calls.c
-===================================================================
-RCS file: /cvs/gstreamer/gst-plugins-good/sys/v4l2/v4l2src_calls.c,v
-retrieving revision 1.84
-diff -u -p -u -p -r1.84 v4l2src_calls.c
---- sys/v4l2/v4l2src_calls.c 8 Jul 2008 12:51:33 -0000 1.84
-+++ sys/v4l2/v4l2src_calls.c 30 Jul 2008 10:23:40 -0000
-@@ -87,7 +87,7 @@ gst_v4l2_buffer_finalize (GstV4l2Buffer
+--- configure 2008-08-31 22:54:24.000000000 +0200
++++ configure 2008-08-31 22:57:45.000000000 +0200
+@@ -1131,6 +1131,8 @@ USE_OSX_VIDEO_FALSE
+ XVIDEO_LIBS
+ USE_GST_V4L2_TRUE
+ USE_GST_V4L2_FALSE
++LIBV4L2_CFLAGS
++LIBV4L2_LIBS
+ XMKMF
+ X_CFLAGS
+ X_PRE_LIBS
+@@ -1286,6 +1288,8 @@ GST_PLUGINS_BASE_CFLAGS
+ GST_PLUGINS_BASE_LIBS
+ GTK2_CFLAGS
+ GTK2_LIBS
++LIBV4L2_CFLAGS
++LIBV4L2_LIBS
+ XMKMF
+ XFIXES_CFLAGS
+ XFIXES_LIBS
+@@ -2093,6 +2097,10 @@ Some influential environment variables:
+ linker flags for GST_PLUGINS_BASE, overriding pkg-config
+ GTK2_CFLAGS C compiler flags for GTK2, overriding pkg-config
+ GTK2_LIBS linker flags for GTK2, overriding pkg-config
++ LIBV4L2_CFLAGS
++ C compiler flags for LIBV4L2, overriding pkg-config
++ LIBV4L2_LIBS
++ linker flags for LIBV4L2, overriding pkg-config
+ XMKMF Path to xmkmf, Makefile generator for X Window System
+ XFIXES_CFLAGS
+ C compiler flags for XFIXES, overriding pkg-config
+@@ -37088,6 +37096,71 @@ else
+ fi
+
+
++if test x$HAVE_GST_V4L2 = xyes; then
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for LIBV4L2" >&5
++echo $ECHO_N "checking for LIBV4L2... " >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBV4L2_CFLAGS"; then
++ pkg_cv_LIBV4L2_CFLAGS="$LIBV4L2_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libv4l2\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libv4l2") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_LIBV4L2_CFLAGS=`$PKG_CONFIG --cflags "libv4l2" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$LIBV4L2_LIBS"; then
++ pkg_cv_LIBV4L2_LIBS="$LIBV4L2_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libv4l2\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libv4l2") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_LIBV4L2_LIBS=`$PKG_CONFIG --libs "libv4l2" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++if test $pkg_failed = yes; then
++ LIBV4L2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libv4l2"`
++ # Put the nasty error message in config.log where it belongs
++ echo "$LIBV4L2_PKG_ERRORS" 1>&5
++
++ have_libv4l2=no
++elif test $pkg_failed = untried; then
++ have_libv4l2=no
++else
++ LIBV4L2_CFLAGS=$pkg_cv_LIBV4L2_CFLAGS
++ LIBV4L2_LIBS=$pkg_cv_LIBV4L2_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "yes" >&6; }
++ have_libv4l2=yes
++fi
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LIBV4L2 test x$have_libv4l2 = xyes
++_ACEOF
++
++fi
++
+
+ { echo "$as_me:$LINENO: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6; }
+diff -up gst-plugins-good-0.10.10/sys/v4l2/Makefile.in~ gst-plugins-good-0.10.10/sys/v4l2/Makefile.in
+--- sys/v4l2/Makefile.in~ 2008-10-05 12:02:41.000000000 +0200
++++ sys/v4l2/Makefile.in 2008-10-05 12:03:13.000000000 +0200
+@@ -319,6 +319,8 @@ LIBOIL_CFLAGS = @LIBOIL_CFLAGS@
+ LIBOIL_LIBS = @LIBOIL_LIBS@
+ LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
+ LIBPNG_LIBS = @LIBPNG_LIBS@
++LIBV4L2_CFLAGS =
++LIBV4L2_LIBS = -lv4l2 -lv4lconvert
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+@@ -615,14 +615,16 @@ libgstvideo4linux2_la_SOURCES = gstv4l2.
+ libgstvideo4linux2_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+ $(GST_BASE_CFLAGS) \
+ $(GST_CFLAGS) \
+- $(X_CFLAGS)
++ $(X_CFLAGS) \
++ $(LIBV4L2_CFLAGS)
+
+ libgstvideo4linux2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+ libgstvideo4linux2_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
+ $(GST_BASE_LIBS) \
+ -lgstinterfaces-$(GST_MAJORMINOR) \
+ $(GST_LIBS) \
+- $(xv_libs)
++ $(xv_libs) \
++ $(LIBV4L2_LIBS)
+
+ noinst_HEADERS = gstv4l2object.h v4l2_calls.h \
+ gstv4l2src.h v4l2src_calls.h \
+diff -up gst-plugins-good-0.10.10/config.h.in~ gst-plugins-good-0.10.10/config.h.in
+--- config.h.in~ 2008-10-05 12:29:29.000000000 +0200
++++ config.h.in 2008-10-05 12:29:29.000000000 +0200
+@@ -173,6 +173,9 @@
+ /* Define to enable Portable Network Graphics library (used by png). */
+ #undef HAVE_LIBPNG
+
++/* Whether libv4l2 is available for video buffer conversion */
++#undef HAVE_LIBV4L2
++
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+
+--- sys/v4l2/v4l2src_calls.c.libv4l 2008-10-11 00:13:37.000000000 +0100
++++ sys/v4l2/v4l2src_calls.c 2008-10-25 01:10:47.000000000 +0100
+@@ -88,7 +88,7 @@ gst_v4l2_buffer_finalize (GstV4l2Buffer
pool->num_live_buffers--;
if (pool->running) {
@@ -293,7 +435,7 @@
GST_WARNING ("could not requeue buffer %p %d", buffer, index);
} else {
/* FIXME: check that the caps didn't change */
-@@ -105,7 +105,7 @@ gst_v4l2_buffer_finalize (GstV4l2Buffer
+@@ -106,7 +106,7 @@ gst_v4l2_buffer_finalize (GstV4l2Buffer
if (!resuscitated) {
GST_LOG ("buffer %p not recovered, unmapping", buffer);
gst_mini_object_unref (GST_MINI_OBJECT (pool));
@@ -302,7 +444,7 @@
GST_MINI_OBJECT_CLASS (v4l2buffer_parent_class)->finalize (GST_MINI_OBJECT
(buffer));
-@@ -171,7 +171,7 @@ gst_v4l2_buffer_new (GstV4l2BufferPool *
+@@ -165,7 +165,7 @@ gst_v4l2_buffer_new (GstV4l2BufferPool *
ret->vbuffer.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
ret->vbuffer.memory = V4L2_MEMORY_MMAP;
@@ -311,7 +453,7 @@
goto querybuf_failed;
GST_LOG (" index: %u", ret->vbuffer.index);
-@@ -185,7 +185,7 @@ gst_v4l2_buffer_new (GstV4l2BufferPool *
+@@ -179,7 +179,7 @@ gst_v4l2_buffer_new (GstV4l2BufferPool *
GST_LOG (" length: %u", ret->vbuffer.length);
GST_LOG (" input: %u", ret->vbuffer.input);
@@ -320,16 +462,16 @@
PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd,
ret->vbuffer.m.offset);
-@@ -235,7 +235,7 @@ gst_v4l2_buffer_pool_finalize (GstV4l2Bu
+@@ -229,7 +229,7 @@ gst_v4l2_buffer_pool_finalize (GstV4l2Bu
pool->lock = NULL;
if (pool->video_fd >= 0)
- close (pool->video_fd);
+ v4l2_close (pool->video_fd);
- if (pool->buffers)
+ if (pool->buffers) {
g_free (pool->buffers);
-@@ -296,7 +296,7 @@ gst_v4l2_buffer_pool_new (GstV4l2Src * v
+@@ -292,7 +292,7 @@ gst_v4l2_buffer_pool_new (GstV4l2Src * v
pool = (GstV4l2BufferPool *) gst_mini_object_new (GST_TYPE_V4L2_BUFFER_POOL);
@@ -338,7 +480,7 @@
if (pool->video_fd < 0)
goto dup_failed;
-@@ -348,7 +348,7 @@ gst_v4l2_buffer_pool_activate (GstV4l2Bu
+@@ -344,7 +344,7 @@ gst_v4l2_buffer_pool_activate (GstV4l2Bu
GST_LOG ("enqueue pool buffer %d", n);
@@ -347,7 +489,7 @@
goto queue_failed;
}
pool->running = TRUE;
-@@ -509,7 +509,7 @@ gst_v4l2src_fill_format_list (GstV4l2Src
+@@ -519,7 +519,7 @@ gst_v4l2src_fill_format_list (GstV4l2Src
format->index = n;
format->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -356,7 +498,7 @@
if (errno == EINVAL) {
g_free (format);
break; /* end of enumeration */
-@@ -585,7 +585,7 @@ gst_v4l2src_probe_caps_for_format_and_si
+@@ -595,7 +595,7 @@ gst_v4l2src_probe_caps_for_format_and_si
/* keep in mind that v4l2 gives us frame intervals (durations); we invert the
* fraction to get framerate */
@@ -365,7 +507,7 @@
goto enum_frameintervals_failed;
if (ival.type == V4L2_FRMIVAL_TYPE_DISCRETE) {
-@@ -611,7 +611,7 @@ gst_v4l2src_probe_caps_for_format_and_si
+@@ -621,7 +621,7 @@ gst_v4l2src_probe_caps_for_format_and_si
gst_value_list_append_value (&rates, &rate);
ival.index++;
@@ -374,25 +516,25 @@
} else if (ival.type == V4L2_FRMIVAL_TYPE_STEPWISE) {
GValue min = { 0, };
GValue step = { 0, };
-@@ -770,7 +770,7 @@ gst_v4l2src_probe_caps_for_format (GstV4
- size.index = 0;
- size.pixel_format = pixelformat;
+@@ -782,7 +782,7 @@ gst_v4l2src_probe_caps_for_format (GstV4
+
+ GST_DEBUG_OBJECT (v4l2src, "Enumerating frame sizes");
- if (ioctl (fd, VIDIOC_ENUM_FRAMESIZES, &size) < 0)
+ if (v4l2_ioctl (fd, VIDIOC_ENUM_FRAMESIZES, &size) < 0)
goto enum_framesizes_failed;
if (size.type == V4L2_FRMSIZE_TYPE_DISCRETE) {
-@@ -787,7 +787,7 @@ gst_v4l2src_probe_caps_for_format (GstV4
+@@ -802,7 +802,7 @@ gst_v4l2src_probe_caps_for_format (GstV4
results = g_list_prepend (results, tmp);
size.index++;
- } while (ioctl (fd, VIDIOC_ENUM_FRAMESIZES, &size) >= 0);
+ } while (v4l2_ioctl (fd, VIDIOC_ENUM_FRAMESIZES, &size) >= 0);
+ GST_DEBUG_OBJECT (v4l2src, "done iterating discrete frame sizes");
} else if (size.type == V4L2_FRMSIZE_TYPE_STEPWISE) {
- for (w = size.stepwise.min_width, h = size.stepwise.min_height;
- w < size.stepwise.max_width && h < size.stepwise.max_height;
-@@ -940,7 +940,7 @@ gst_v4l2src_grab_frame (GstV4l2Src * v4l
+ GST_DEBUG_OBJECT (v4l2src, "we have stepwise frame sizes:");
+@@ -972,7 +972,7 @@ gst_v4l2src_grab_frame (GstV4l2Src * v4l
buffer.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
buffer.memory = V4L2_MEMORY_MMAP;
@@ -401,7 +543,7 @@
GST_WARNING_OBJECT (v4l2src,
"problem grabbing frame %d (ix=%d), trials=%d, pool-ct=%d, buf.flags=%d",
-@@ -1167,7 +1167,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
+@@ -1190,7 +1190,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
memset (&format, 0x00, sizeof (struct v4l2_format));
format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -410,7 +552,7 @@
goto get_fmt_failed;
format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-@@ -1179,7 +1179,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
+@@ -1202,7 +1202,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
* combined, there are other modes for requesting fields individually) */
format.fmt.pix.field = V4L2_FIELD_INTERLACED;
@@ -419,7 +561,7 @@
if (errno != EINVAL)
goto set_fmt_failed;
-@@ -1188,7 +1188,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
+@@ -1211,7 +1211,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
format.fmt.pix.height = height;
format.fmt.pix.pixelformat = pixelformat;
format.fmt.pix.field = V4L2_FIELD_NONE;
@@ -428,7 +570,7 @@
goto set_fmt_failed;
}
-@@ -1203,7 +1203,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
+@@ -1226,7 +1226,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
memset (&stream, 0x00, sizeof (struct v4l2_streamparm));
stream.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -437,7 +579,7 @@
GST_ELEMENT_WARNING (v4l2src, RESOURCE, SETTINGS,
(_("Could not get parameters on device '%s'"),
v4l2src->v4l2object->videodev), GST_ERROR_SYSTEM);
-@@ -1231,7 +1231,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
+@@ -1256,7 +1256,7 @@ gst_v4l2src_set_capture (GstV4l2Src * v4
stream.parm.capture.timeperframe.denominator = fps_n;
/* some cheap USB cam's won't accept any change */
@@ -446,7 +588,7 @@
GST_ELEMENT_WARNING (v4l2src, RESOURCE, SETTINGS,
(_("Video input device did not accept new frame rate setting.")),
GST_ERROR_SYSTEM);
-@@ -1313,7 +1313,7 @@ gst_v4l2src_capture_init (GstV4l2Src * v
+@@ -1338,7 +1338,7 @@ gst_v4l2src_capture_init (GstV4l2Src * v
breq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
breq.memory = V4L2_MEMORY_MMAP;
@@ -455,7 +597,7 @@
goto reqbufs_failed;
GST_LOG_OBJECT (v4l2src, " count: %u", breq.count);
-@@ -1408,7 +1408,7 @@ gst_v4l2src_capture_start (GstV4l2Src *
+@@ -1433,7 +1433,7 @@ gst_v4l2src_capture_start (GstV4l2Src *
if (!gst_v4l2_buffer_pool_activate (v4l2src->pool, v4l2src))
goto pool_activate_failed;
@@ -464,7 +606,7 @@
goto streamon_failed;
}
-@@ -1453,7 +1453,7 @@ gst_v4l2src_capture_stop (GstV4l2Src * v
+@@ -1478,7 +1478,7 @@ gst_v4l2src_capture_stop (GstV4l2Src * v
if (v4l2src->use_mmap) {
/* we actually need to sync on all queued buffers but not
* on the non-queued ones */
@@ -473,7 +615,7 @@
goto streamoff_failed;
}
-@@ -1529,14 +1529,14 @@ gst_v4l2src_get_nearest_size (GstV4l2Src
+@@ -1554,14 +1554,14 @@ gst_v4l2src_get_nearest_size (GstV4l2Src
fmt.fmt.pix.pixelformat = pixelformat;
fmt.fmt.pix.field = V4L2_FIELD_INTERLACED;
@@ -490,7 +632,7 @@
}
if (r < 0) {
-@@ -1556,14 +1556,14 @@ gst_v4l2src_get_nearest_size (GstV4l2Src
+@@ -1581,14 +1581,14 @@ gst_v4l2src_get_nearest_size (GstV4l2Src
fmt.fmt.pix.width = *width;
fmt.fmt.pix.height = *height;
@@ -507,150 +649,3 @@
}
if (r < 0)
---- configure 2008-08-31 22:54:24.000000000 +0200
-+++ configure 2008-08-31 22:57:45.000000000 +0200
-@@ -1131,6 +1131,8 @@ USE_OSX_VIDEO_FALSE
- XVIDEO_LIBS
- USE_GST_V4L2_TRUE
- USE_GST_V4L2_FALSE
-+LIBV4L2_CFLAGS
-+LIBV4L2_LIBS
- XMKMF
- X_CFLAGS
- X_PRE_LIBS
-@@ -1286,6 +1288,8 @@ GST_PLUGINS_BASE_CFLAGS
- GST_PLUGINS_BASE_LIBS
- GTK2_CFLAGS
- GTK2_LIBS
-+LIBV4L2_CFLAGS
-+LIBV4L2_LIBS
- XMKMF
- XFIXES_CFLAGS
- XFIXES_LIBS
-@@ -2093,6 +2097,10 @@ Some influential environment variables:
- linker flags for GST_PLUGINS_BASE, overriding pkg-config
- GTK2_CFLAGS C compiler flags for GTK2, overriding pkg-config
- GTK2_LIBS linker flags for GTK2, overriding pkg-config
-+ LIBV4L2_CFLAGS
-+ C compiler flags for LIBV4L2, overriding pkg-config
-+ LIBV4L2_LIBS
-+ linker flags for LIBV4L2, overriding pkg-config
- XMKMF Path to xmkmf, Makefile generator for X Window System
- XFIXES_CFLAGS
- C compiler flags for XFIXES, overriding pkg-config
-@@ -37088,6 +37096,71 @@ else
- fi
-
-
-+if test x$HAVE_GST_V4L2 = xyes; then
-+
-+pkg_failed=no
-+{ echo "$as_me:$LINENO: checking for LIBV4L2" >&5
-+echo $ECHO_N "checking for LIBV4L2... " >&6; }
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$LIBV4L2_CFLAGS"; then
-+ pkg_cv_LIBV4L2_CFLAGS="$LIBV4L2_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libv4l2\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libv4l2") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_LIBV4L2_CFLAGS=`$PKG_CONFIG --cflags "libv4l2" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$LIBV4L2_LIBS"; then
-+ pkg_cv_LIBV4L2_LIBS="$LIBV4L2_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libv4l2\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libv4l2") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_LIBV4L2_LIBS=`$PKG_CONFIG --libs "libv4l2" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+
-+if test $pkg_failed = yes; then
-+ LIBV4L2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libv4l2"`
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$LIBV4L2_PKG_ERRORS" 1>&5
-+
-+ have_libv4l2=no
-+elif test $pkg_failed = untried; then
-+ have_libv4l2=no
-+else
-+ LIBV4L2_CFLAGS=$pkg_cv_LIBV4L2_CFLAGS
-+ LIBV4L2_LIBS=$pkg_cv_LIBV4L2_LIBS
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "yes" >&6; }
-+ have_libv4l2=yes
-+fi
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBV4L2 test x$have_libv4l2 = xyes
-+_ACEOF
-+
-+fi
-+
-
- { echo "$as_me:$LINENO: checking for X" >&5
- echo $ECHO_N "checking for X... $ECHO_C" >&6; }
-diff -up gst-plugins-good-0.10.10/sys/v4l2/Makefile.in~ gst-plugins-good-0.10.10/sys/v4l2/Makefile.in
---- sys/v4l2/Makefile.in~ 2008-10-05 12:02:41.000000000 +0200
-+++ sys/v4l2/Makefile.in 2008-10-05 12:03:13.000000000 +0200
-@@ -319,6 +319,8 @@ LIBOIL_CFLAGS = @LIBOIL_CFLAGS@
- LIBOIL_LIBS = @LIBOIL_LIBS@
- LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
- LIBPNG_LIBS = @LIBPNG_LIBS@
-+LIBV4L2_CFLAGS =
-+LIBV4L2_LIBS = -lv4l2 -lv4lconvert
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
-@@ -615,14 +615,16 @@ libgstvideo4linux2_la_SOURCES = gstv4l2.
- libgstvideo4linux2_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
- $(GST_BASE_CFLAGS) \
- $(GST_CFLAGS) \
-- $(X_CFLAGS)
-+ $(X_CFLAGS) \
-+ $(LIBV4L2_CFLAGS)
-
- libgstvideo4linux2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
- libgstvideo4linux2_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
- $(GST_BASE_LIBS) \
- -lgstinterfaces-$(GST_MAJORMINOR) \
- $(GST_LIBS) \
-- $(xv_libs)
-+ $(xv_libs) \
-+ $(LIBV4L2_LIBS)
-
- noinst_HEADERS = gstv4l2object.h v4l2_calls.h \
- gstv4l2src.h v4l2src_calls.h \
-diff -up gst-plugins-good-0.10.10/config.h.in~ gst-plugins-good-0.10.10/config.h.in
---- config.h.in~ 2008-10-05 12:29:29.000000000 +0200
-+++ config.h.in 2008-10-05 12:29:29.000000000 +0200
-@@ -173,6 +173,9 @@
- /* Define to enable Portable Network Graphics library (used by png). */
- #undef HAVE_LIBPNG
-
-+/* Whether libv4l2 is available for video buffer conversion */
-+#undef HAVE_LIBV4L2
-+
- /* Define to 1 if you have the <memory.h> header file. */
- #undef HAVE_MEMORY_H
-
Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- gstreamer-plugins-good.spec 23 Oct 2008 01:34:44 -0000 1.76
+++ gstreamer-plugins-good.spec 25 Oct 2008 00:18:49 -0000 1.77
@@ -5,8 +5,8 @@
%define _gstpb 0.10.17
Name: %{gstreamer}-plugins-good
-Version: 0.10.10
-Release: 6%{?dist}
+Version: 0.10.11
+Release: 1%{?dist}
Summary: GStreamer plug-ins with good code and licensing
Group: Applications/Multimedia
@@ -15,6 +15,7 @@
Source: http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# http://bugzilla.gnome.org/show_bug.cgi?id=545033
Patch0: gst-plugins-good-0.10.9-libv4l.patch
Requires: %{gstreamer} >= %{_gst}
@@ -244,6 +245,10 @@
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
%changelog
+* Sat Oct 25 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.11-1
+- Update to 0.10.11
+- Update libv4l patch
+
* Thu Oct 23 2008 Lennart Poettering <lpoetter at redhat.com> 0.10.10-6
- Enable the PulseAudio element and make it replace the old
pulseaudio-plugins-pulse package
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 27 Aug 2008 08:18:53 -0000 1.12
+++ sources 25 Oct 2008 00:18:49 -0000 1.13
@@ -1 +1 @@
-a57b4f6bdb9a4a00351f9da74de35ae9 gst-plugins-good-0.10.10.tar.bz2
+79b086c2dc0e07ae0c8ddc91512bab3a gst-plugins-good-0.10.11.tar.bz2
--- gst-plugins-good-0.10.8-speex-nego.patch DELETED ---
--- gst-plugins-good-0.10.8-v4l2-progressive-fix.patch DELETED ---
--- gst-plugins-good-v4l2-new-kernel.patch DELETED ---
- Previous message (by thread): rpms/kernel/devel patch-2.6.27.4-rc3.bz2.sign, NONE, 1.1 .cvsignore, 1.950, 1.951 TODO, 1.26, 1.27 kernel.spec, 1.1080, 1.1081 linux-2.6-upstream-reverts.patch, 1.3, 1.4 sources, 1.912, 1.913 upstream, 1.824, 1.825 linux-2.6-x86-acpi-fix-resume-on-64-bit-UP-systems.patch, 1.1, NONE
- Next message (by thread): rpms/lyx/devel lyx-1.6.0-xdg_open.patch, NONE, 1.1 lyx.spec, 1.80, 1.81 lyx-1.5.4-xdg_open.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list