I have made the following changes intended for : nemo:devel:mw / omap3camd nemo:devel:mw / omap3camd-devel nemo:devel:mw / gst-nokia-videosrc
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.merproject.org//request/show/118 Thank You, Mohammed Sameer [This message was auto-generated] --- Request # 118: Messages from BOSS: State: review at 2013-03-29T22:07:28 by cibot Reviews: accepted by cibot : Prechecks succeeded. new for nemo:devel:mw : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:msameer:gstreamer / omap3camd -> nemo:devel:mw / omap3camd changes files: -------------- ++++++ new changes file: --- omap3camd.changes +++ omap3camd.changes @@ -0,0 +1,2 @@ +* Fri Mar 29 2013 Mohammed Sameer <[email protected]> - 0.57.0 +- Initial RPM packaging new: ---- gst-nokia-camera-0.57.0-bin-armv7hl.tar.bz2 license.txt omap3camd.changes omap3camd.spec spec files: ----------- ++++++ new spec file: --- omap3camd.spec +++ omap3camd.spec @@ -0,0 +1,45 @@ +Name: libomap3camd +Summary: omap3camd library +Version: 0.57.0 +Release: 0 +Group: Multimedia/Camera Adaptation +License: Nokia Proprietary +ExclusiveArch: armv7hl armv7nhl armv7thl armv7tnhl armv8el +URL: http://meego.gitorious.org/maemo-multimedia/gst-nokia-videosrc +Source0: gst-nokia-camera-0.57.0-bin-armv7hl.tar.bz2 +Source1: license.txt +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +Provides: libomap3camd-n9xx + +%description ++ OMAP3 camera Library +* 3A algorithms +* Flash control +* Image pre-processing +* Low-level Image metadata + +%prep +%setup -q -n gst-nokia-camera-0.57.0-bin-armv7hl + +%build + +%install +rm -rf %{buildroot} +install -d $RPM_BUILD_ROOT/etc/ +install -d $RPM_BUILD_ROOT/%{_libdir}/ +cp -arv etc/omapcam $RPM_BUILD_ROOT/etc/ +cp -arv usr/lib/libomap3camd.so.0* $RPM_BUILD_ROOT/%{_libdir}/ +cp %{SOURCE1} . + +chmod 755 %{buildroot}%{_libdir}/libomap3camd.so.0.0.0 + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc license.txt +%config /etc/omapcam/* +%{_libdir}/libomap3camd.so.* other changes: -------------- ++++++ gst-nokia-camera-0.57.0-bin-armv7hl.tar.bz2 (new) ++++++ license.txt (new) --- license.txt +++ license.txt @@ -0,0 +1,9 @@ +Copyright (c) Nokia Corporation 2010 +All Rights Reserved. + +This material, including documentation and any related computer programs, is +protected by copyright controlled by Nokia Corporation. All rights are +reserved. Modifying, adapting and/or translating, any or all of this material +requires the prior written consent of Nokia. Distribution for commercial +purposes not allowed without prior written approval from Nokia. + submit: home:msameer:gstreamer / omap3camd-devel -> nemo:devel:mw / omap3camd-devel changes files: -------------- ++++++ new changes file: --- omap3camd-devel.changes +++ omap3camd-devel.changes @@ -0,0 +1,2 @@ +* Fri Mar 29 2013 Mohammed Sameer <[email protected]> - 0.0.0 +- Initial RPM packaging new: ---- omap3camd-0.0.0.tar.gz omap3camd-devel.changes omap3camd-devel.spec spec files: ----------- ++++++ new spec file: --- omap3camd-devel.spec +++ omap3camd-devel.spec @@ -0,0 +1,34 @@ +Name: libomap3camd-devel +Summary: Header files for omap3camd library +Version: 0.0.0 +Release: 0 +Group: Multimedia/Camera Adaptation +License: LGPLv2.1 +ExclusiveArch: armv7hl armv7nhl armv7thl armv7tnhl armv8el +URL: https://gitorious.org/msameer/omap3camd +Source: omap3camd-0.0.0.tar.gz +Requires: libomap3camd >= 0.57.0 +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +%description +Header files for omap3camd library + +%prep +%setup -q -n omap3camd-0.0.0 + +%build + +%install +rm -rf %{buildroot} + +install -m 644 -D omap3cam.h $RPM_BUILD_ROOT/%{_includedir}/omap3cam/omap3cam.h +install -m 644 -D libomap3camd.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libomap3camd.pc +ln -sf %{_libdir}/libomap3camd.so.0.0.0 $RPM_BUILD_ROOT/%{_libdir}/libomap3camd.so + +%files +%defattr(-,root,root,-) +%doc COPYING +%{_includedir}/omap3cam/omap3cam.h +%{_libdir}/pkgconfig/libomap3camd.pc +%{_libdir}/libomap3camd.so other changes: -------------- ++++++ omap3camd-0.0.0.tar.gz (new) submit: home:msameer:gstreamer / gst-nokia-videosrc -> nemo:devel:mw / gst-nokia-videosrc changes files: -------------- ++++++ new changes file: --- gst-nokia-videosrc.changes +++ gst-nokia-videosrc.changes @@ -0,0 +1,3 @@ +* Wed Feb 20 2013 Mohammed Sameer <[email protected]> - 0.57.0 +- Initial RPM packaging + new: ---- 0001-Disable-gtk-doc.patch 0002-Use-the-new-media-controller-API.patch 0003-Fix-build-failure-with-latest-v4l2-headers.patch 0004-Link-check_subdevsrc-against-photography-interface.patch gst-nokia-videosrc-0.57.0.tar.gz gst-nokia-videosrc.changes gst-nokia-videosrc.spec spec files: ----------- ++++++ new spec file: --- gst-nokia-videosrc.spec +++ gst-nokia-videosrc.spec @@ -0,0 +1,72 @@ +Name: gstreamer0.10-nokia-videosrc +Summary: GStreamer elements for capturing video and hiqh-quality still images +Version: 0.57.0 +Release: 0 +Group: Multimedia/Camera Adaptation +License: LGPLv2.1 +ExclusiveArch: armv7hl armv7nhl armv7thl armv7tnhl armv8el +URL: http://meego.gitorious.org/maemo-multimedia/gst-nokia-videosrc +Source: gst-nokia-videosrc-%{version}.tar.gz +Patch0: 0001-Disable-gtk-doc.patch +Patch1: 0002-Use-the-new-media-controller-API.patch +Patch2: 0003-Fix-build-failure-with-latest-v4l2-headers.patch +Patch3: 0004-Link-check_subdevsrc-against-photography-interface.patch +Provides: gst-plugins-camera +BuildRequires: pkgconfig(gstreamer-0.10) +BuildRequires: pkgconfig(gstreamer-plugins-bad-free-0.10) +BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) +BuildRequires: pkgconfig(libomap3camd) + +%description +GStreamer elements for capturing video and hiqh-quality still images + +%package devel +Summary: development headers for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +GStreamer elements for capturing video and hiqh-quality still images - development headers + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%post devel -p /sbin/ldconfig +%postun devel -p /sbin/ldconfig + +%prep +%setup -q -n gst-nokia-videosrc-%{version} + +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 + +%build +NOCONFIGURE=1 ./autogen.sh +%configure --disable-gtk-doc + +make %{?jobs:-j%jobs} + +%install +%make_install + +# pipeline.conf is provided by nokia-n950-configs +rm -rf $RPM_BUILD_ROOT/etc/camera/ + +# We don't generate any tests package for now: +rm -rf $RPM_BUILD_ROOT/usr/share/gstreamer0.10-nokia-videosrc-tests + +%files +%defattr(-,root,root,-) +%{_libdir}/gstreamer-0.10/libgstmcsrc.so +%{_libdir}/gstreamer-0.10/libgstsubdevcam.so +%{_libdir}/gstreamer-0.10/libgstv4l2newcam.so +%{_libdir}/libgstcamera-0.10.so.0.0.0 +%{_libdir}/libgstcamera-0.10.so.0 + +%files devel +%defattr(-,root,root,-) +%{_libdir}/libgstcamera-0.10.so +%{_libdir}/pkgconfig/gstreamer-nokia-videosrc-0.10.pc +%{_includedir}/gstreamer-0.10/gst/camera/*.h other changes: -------------- ++++++ 0001-Disable-gtk-doc.patch (new) --- 0001-Disable-gtk-doc.patch +++ 0001-Disable-gtk-doc.patch @@ -0,0 +1,46 @@ +From bf0dc92b56f28e332b28dccca2e4007a084321c0 Mon Sep 17 00:00:00 2001 +From: Mohammed Sameer <[email protected]> +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 + ++++++ 0002-Use-the-new-media-controller-API.patch (new) --- 0002-Use-the-new-media-controller-API.patch +++ 0002-Use-the-new-media-controller-API.patch @@ -0,0 +1,107 @@ +From 2232a7770295d9f989a1cc4314b7cd9b9284e8b0 Mon Sep 17 00:00:00 2001 +From: Mohammed Sameer <[email protected]> +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 + ++++++ 0003-Fix-build-failure-with-latest-v4l2-headers.patch (new) --- 0003-Fix-build-failure-with-latest-v4l2-headers.patch +++ 0003-Fix-build-failure-with-latest-v4l2-headers.patch @@ -0,0 +1,37 @@ +From 5e6c35e6e1c3efa73892ab912d1392a67fd84870 Mon Sep 17 00:00:00 2001 +From: Mohammed Sameer <[email protected]> +Date: Wed, 20 Feb 2013 22:16:36 +0200 +Subject: [PATCH 3/5] Fix build failure with latest v4l2 headers + +--- + gst-libs/gst/camera/bufferpool.c | 1 - + gst/v4l2newcam/v4l2camsrc_calls.c | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/gst-libs/gst/camera/bufferpool.c b/gst-libs/gst/camera/bufferpool.c +index 4514584..ff6c274 100644 +--- a/gst-libs/gst/camera/bufferpool.c ++++ b/gst-libs/gst/camera/bufferpool.c +@@ -197,7 +197,6 @@ gst_basemcsrc_buffer_new (GstBaseMcSrcBufferPool * pool, + else if (ret->vbuffer.memory == V4L2_MEMORY_USERPTR) + GST_LOG (" user address: %p", ret->vbuffer.m.userptr); + GST_LOG (" length: %u", ret->vbuffer.length); +- GST_LOG (" input: %u", ret->vbuffer.input); + + return ret; + +diff --git a/gst/v4l2newcam/v4l2camsrc_calls.c b/gst/v4l2newcam/v4l2camsrc_calls.c +index 61aab26..ee4ae9c 100644 +--- a/gst/v4l2newcam/v4l2camsrc_calls.c ++++ b/gst/v4l2newcam/v4l2camsrc_calls.c +@@ -247,7 +247,6 @@ gst_v4l2camsrc_buffer_new (GstV4l2NewCamSrcBufferPool * pool, + else if (vbuffer->memory == V4L2_MEMORY_USERPTR) + GST_LOG (" user address: %u", vbuffer->m.userptr); + GST_LOG (" length: %u", vbuffer->length); +- GST_LOG (" input: %u", vbuffer->input); + #endif + + return ret; +-- +1.7.10.4 + ++++++ 0004-Link-check_subdevsrc-against-photography-interface.patch (new) --- 0004-Link-check_subdevsrc-against-photography-interface.patch +++ 0004-Link-check_subdevsrc-against-photography-interface.patch @@ -0,0 +1,24 @@ +From e0059c774f8e53d32610d85ae551df1b21230663 Mon Sep 17 00:00:00 2001 +From: Mohammed Sameer <[email protected]> +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 + ++++++ gst-nokia-videosrc-0.57.0.tar.gz (new)
