|
[-]
[+]
|
Added |
gst-nokia-videosrc.changes
|
|
|
|
[-]
[+]
|
Added |
gst-nokia-videosrc.spec
^
|
|
|
|
[-]
[+]
|
Added |
0001-Disable-gtk-doc.patch
^
|
| @@ -0,0 +1,46 @@
+From bf0dc92b56f28e332b28dccca2e4007a084321c0 Mon Sep 17 00:00:00 2001
+From: Mohammed Sameer <msameer@foolab.org>
+Date: Wed, 20 Feb 2013 21:49:40 +0200
+Subject: [PATCH 1/5] Disable gtk-doc
+
+---
+ Makefile.am | 4 ++--
+ configure.ac | 5 +----
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index abecf1a..5af41d3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,3 @@
+-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
++# DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+
+-SUBDIRS = m4 gst-libs gst tests docs pkgconfig data
++SUBDIRS = m4 gst-libs gst tests pkgconfig data
+diff --git a/configure.ac b/configure.ac
+index 524e7a5..a5ccf68 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,7 +31,7 @@ AC_PROG_CC
+ AC_PROG_LIBTOOL
+
+ # check for gtk-doc
+-GTK_DOC_CHECK(1.6)
++dnl GTK_DOC_CHECK(1.6)
+
+ dnl decide on error flags
+ AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
+@@ -168,9 +168,6 @@ AC_OUTPUT(Makefile \
+ gst/mcsrc/Makefile \
+ tests/Makefile \
+ tests/check/Makefile \
+- docs/Makefile \
+- docs/reference/Makefile \
+- docs/reference/gst-nokia-videosrc/Makefile \
+ pkgconfig/Makefile \
+ pkgconfig/gstreamer-nokia-videosrc.pc \
+ data/Makefile
+--
+1.7.10.4
+
|
|
[-]
[+]
|
Added |
0002-Use-the-new-media-controller-API.patch
^
|
| @@ -0,0 +1,107 @@
+From 2232a7770295d9f989a1cc4314b7cd9b9284e8b0 Mon Sep 17 00:00:00 2001
+From: Mohammed Sameer <msameer@foolab.org>
+Date: Wed, 20 Feb 2013 22:02:25 +0200
+Subject: [PATCH 2/5] Use the new media controller API
+
+Media controller API has been updated. Use the new API.
+---
+ gst-libs/gst/camera/mediacontroller.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/gst-libs/gst/camera/mediacontroller.c b/gst-libs/gst/camera/mediacontroller.c
+index c285490..b6e2d38 100644
+--- a/gst-libs/gst/camera/mediacontroller.c
++++ b/gst-libs/gst/camera/mediacontroller.c
+@@ -49,7 +49,7 @@ GST_DEBUG_CATEGORY_EXTERN (gst_basemcsrc_debug);
+
+ #define MAKE_PIXFMT(a, b) { a, b, #a }
+
+-#define MEDIA_ENTITY_TYPE(x) ((x) & MEDIA_ENTITY_TYPE_MASK)
++#define MEDIA_ENTITY_TYPE(x) ((x) & MEDIA_ENT_TYPE_MASK)
+
+ struct pixfmt_data_table {
+ enum v4l2_mbus_pixelcode pcode;
+@@ -138,8 +138,8 @@ gst_basemcsrc_mc_query_entities (GstMediaController *mc)
+ if (ioctl (mc->fd, MEDIA_IOC_ENUM_ENTITIES, &e->info) < 0)
+ break;
+
+- if (e->info.type != MEDIA_ENTITY_TYPE_NODE_V4L &&
+- MEDIA_ENTITY_TYPE (e->info.type) != MEDIA_ENTITY_TYPE_SUBDEV)
++ if (e->info.type != MEDIA_ENT_T_DEVNODE_V4L &&
++ MEDIA_ENTITY_TYPE (e->info.type) != MEDIA_ENT_T_V4L2_SUBDEV)
+ {
+ continue;
+ }
+@@ -176,7 +176,7 @@ gst_basemcsrc_mc_query_entities (GstMediaController *mc)
+
+ GST_DEBUG ("Found entity '%s' (id=%d, device=%s) which is %s has %d pads and %d links",
+ e->info.name, e->info.id, e->devname,
+- MEDIA_ENTITY_TYPE (e->info.type) == MEDIA_ENTITY_TYPE_NODE ? "node" : "subdev",
++ MEDIA_ENTITY_TYPE (e->info.type) == MEDIA_ENT_T_DEVNODE ? "node" : "subdev",
+ e->info.pads, e->info.links);
+
+ /* New entity for next round */
+@@ -234,8 +234,8 @@ gst_basemcsrc_mc_query_links (GstMediaController *mc)
+ e->links[i].source.index,
+ ((GstMediaEntity *)g_list_nth_data (mc->entities, e->links[i].sink.entity-1))->info.name,
+ e->links[i].sink.index,
+- e->links[i].flags & MEDIA_LINK_FLAG_ACTIVE ? "ACTIVE" : "",
+- e->links[i].flags & MEDIA_LINK_FLAG_IMMUTABLE ? "IMMUTABLE" : "");
++ e->links[i].flags & MEDIA_LNK_FL_ENABLED ? "ACTIVE" : "",
++ e->links[i].flags & MEDIA_LNK_FL_IMMUTABLE ? "IMMUTABLE" : "");
+ }
+ }
+
+@@ -365,7 +365,7 @@ gst_basemcsrc_mc_setup_link (GstMediaController *mc, const GstMediaEntity *src,
+ pformat.pad = srcpad;
+ pformat.format = *format;
+
+- if (MEDIA_ENTITY_TYPE (src->info.type) != MEDIA_ENTITY_TYPE_NODE) {
++ if (MEDIA_ENTITY_TYPE (src->info.type) != MEDIA_ENT_T_DEVNODE) {
+
+ if (!gst_basemcsrc_mc_configure_subdev (src, &pformat)) {
+ GST_WARNING ("Failed to configure input subdev");
+@@ -385,18 +385,18 @@ gst_basemcsrc_mc_setup_link (GstMediaController *mc, const GstMediaEntity *src,
+ /* source pad */
+ link.source.entity = src->info.id;
+ link.source.index = srcpad;
+- link.source.flags = MEDIA_PAD_FLAG_OUTPUT;
++ link.source.flags = MEDIA_PAD_FL_SOURCE;
+
+ /* sink pad */
+ link.sink.entity = sink->info.id;
+ link.sink.index = sinkpad;
+- link.sink.flags = MEDIA_PAD_FLAG_INPUT;
++ link.sink.flags = MEDIA_PAD_FL_SINK;
+
+ /* Set / reset the ACTIVE flag */
+ if (active) {
+- link.flags = flags | MEDIA_LINK_FLAG_ACTIVE;
++ link.flags = flags | MEDIA_LNK_FL_ENABLED;
+ } else {
+- link.flags = flags & ~MEDIA_LINK_FLAG_ACTIVE;
++ link.flags = flags & ~MEDIA_LNK_FL_ENABLED;
+ }
+
+ GST_DEBUG ("Setting link [%s:%d] -> [%s:%d] %s (flags: %d)",
+@@ -411,7 +411,7 @@ gst_basemcsrc_mc_setup_link (GstMediaController *mc, const GstMediaEntity *src,
+
+ if (format) {
+ /* Set format to sink pad, if the entity isn't an output node */
+- if (MEDIA_ENTITY_TYPE (sink->info.type) != MEDIA_ENTITY_TYPE_NODE) {
++ if (MEDIA_ENTITY_TYPE (sink->info.type) != MEDIA_ENT_T_DEVNODE) {
+
+ pformat.pad = sinkpad;
+
+@@ -613,7 +613,7 @@ gst_basemcsrc_mc_reset_links (GstMediaController *mc)
+ src = (GstMediaEntity *) iter->data;
+
+ for (i=0; i < src->info.links; i++) {
+- if (src->links[i].flags & MEDIA_LINK_FLAG_IMMUTABLE)
++ if (src->links[i].flags & MEDIA_LNK_FL_IMMUTABLE)
+ continue;
+
+ sink = (GstMediaEntity *) g_list_nth_data (mc->entities, src->links[i].sink.entity-1);
+--
+1.7.10.4
+
|
|
[-]
[+]
|
Added |
0004-Link-check_subdevsrc-against-photography-interface.patch
^
|
| @@ -0,0 +1,24 @@
+From e0059c774f8e53d32610d85ae551df1b21230663 Mon Sep 17 00:00:00 2001
+From: Mohammed Sameer <msameer@foolab.org>
+Date: Wed, 20 Feb 2013 22:27:32 +0200
+Subject: [PATCH 4/5] Link check_subdevsrc against photography interface
+
+---
+ tests/check/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
+index ff8cf0c..8c3780e 100644
+--- a/tests/check/Makefile.am
++++ b/tests/check/Makefile.am
+@@ -24,6 +24,6 @@ test_PROGRAMS = $(check_subdevsrc)
+ dist_test_DATA = tests.xml
+
+ AM_CFLAGS = $(GST_CFLAGS) $(GST_CHECK_CFLAGS) -DGST_USE_UNSTABLE_API -I$(top_builddir)/gst-libs
+-LDADD = $(GST_LIBS) $(GST_CHECK_LIBS) $(GST_BAD_LIBS)
++LDADD = $(GST_LIBS) $(GST_CHECK_LIBS) $(GST_BAD_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) -lgstphotography-$(GST_MAJORMINOR)
+
+ EXTRA_DIST = $(test_DATA)
+--
+1.7.10.4
+
|
|
|
Added |
gst-nokia-videosrc-0.57.0.tar.gz
^
|
