modify spec to build and merge prev modification

Change-Id: Ie6fdd579e9085e6e668e99883ab319fd3602b619

diff --git a/.gbs.conf b/.gbs.conf
index 1b88822..7302e56 100644 (file)
--- a/.gbs.conf
+++ b/.gbs.conf
@@ -1,3 +1,3 @@
 [general]
-upstream_branch = tizen
+upstream_branch = upstream/1.6
 upstream_tag = ${upstreamversion}

diff --git a/configure.ac b/configure.ac
index d753364..53f2fae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -135,9 +135,9 @@ AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO],
 dnl check for bash completion
 AC_ARG_WITH([bash-completion-dir],
     AS_HELP_STRING([--with-bash-completion-dir[=PATH]],
-        [Install the bash auto-completion script in this directory. @<:@default=yes@:>@]),
+        [Install the bash auto-completion script in this directory. @<:@default=no@:>@]),
     [],
-    [with_bash_completion_dir=yes])
+    [with_bash_completion_dir=no])
 
 if test "x$with_bash_completion_dir" = "xyes"
 then

diff --git a/packaging/common.tar.bz2 b/packaging/common.tar.bz2
deleted file mode 100644 (file)
index e03bc66..0000000
Binary files a/packaging/common.tar.bz2 and /dev/null differ

diff --git a/packaging/common.tar.gz b/packaging/common.tar.gz
new file mode 100644 (file)
index 0000000..d9ed1aa
Binary files /dev/null and b/packaging/common.tar.gz differ

diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec
index c446272..e6a4a65 100644 (file)
--- a/packaging/gstreamer.spec
+++ b/packaging/gstreamer.spec
@@ -1,24 +1,27 @@
 %define gst_branch 1.0
 
 Name:           gstreamer
-Version:        1.4.1
-Release:        2
+Version:        1.6.1
+Release:        1
 Summary:        Streaming-Media Framework Runtime
 License:        LGPL-2.1+
 Group:          Multimedia/Framework
 Url:            http://gstreamer.freedesktop.org/
 Source0:        http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.xz
-Source100:      common.tar.bz2
+Source100:      common.tar.gz
 BuildRequires:  bison
 BuildRequires:  gettext-tools
 BuildRequires:  check-devel
 BuildRequires:  fdupes
 BuildRequires:  flex
-BuildRequires:  glib2-devel >= 2.32.0
+BuildRequires:  glib2-devel >= 2.32
 BuildRequires:  libtool
 BuildRequires:  libxml2-devel
 BuildRequires:  gobject-introspection-devel >= 1.31.1
 BuildRequires:  pkgconfig(dlog)
+BuildRequires:  gcc-c++
+BuildRequires:  orc >= 0.4.16
+BuildRequires:  python
 
 %description
 GStreamer is a streaming-media framework, based on graphs of filters
@@ -28,7 +31,6 @@ about anything else media-related.  Its plug-in-based architecture
 means that new data types or processing capabilities can be added by
 installing new plug-ins.
 
-
 %package utils
 Summary:        Streaming-Media Framework Runtime
 Group:          Multimedia/Framework
@@ -44,7 +46,6 @@ about anything else media-related.  Its plug-in-based architecture
 means that new data types or processing capabilities can be added by
 installing new plug-ins.
 
-
 %package devel
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries
@@ -56,15 +57,12 @@ Requires:       %{name} = %{version}
 This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
-
 %lang_package
 
-
 %prep
 %setup -q -n gstreamer-%{version}
 %setup -q -T -D -a 100
 
-
 %build
 # FIXME: GTKDOC_CFLAGS, GST_OBJ_CFLAGS:
 # Silently ignored compilation of uninstalled gtk-doc scanners without RPM_OPT_FLAGS.
@@ -74,15 +72,14 @@ export CFLAGS="%{optflags} \
        -DGST_QUEUE2_MODIFICATION\
        -DGST_EXT_CURRENT_BYTES\
        -fno-strict-aliasing"
+
 %configure\
-%if %{with introspection}
         --enable-introspection\
-%endif
-       --disable-static\
-       --enable-dlog
+        --disable-static\
+        --enable-dlog\
+        --disable-examples
 make %{?_smp_mflags}
 
-
 %install
 %make_install
 mkdir -p %{buildroot}%{_datadir}/gstreamer-%{gst_branch}/presets
@@ -95,45 +92,193 @@ rm -rf %{buildroot}%{_docdir}/%{name}/pwg
 mkdir -p %{buildroot}%{_datadir}/gstreamer-%{gst_branch}/presets
 %fdupes %{buildroot}
 
-
 %post -p /sbin/ldconfig
 
-
 %postun -p /sbin/ldconfig
 
-
 %files
 %manifest %{name}.manifest
-%defattr(-, root, root)
 %license COPYING
+
 %dir %{_datadir}/gstreamer-%{gst_branch}
 %dir %{_datadir}/gstreamer-%{gst_branch}/presets
 %dir %{_libdir}/gstreamer-%{gst_branch}
-%{_libdir}/gstreamer-%{gst_branch}/*.so
 %dir %{_libexecdir}/gstreamer-%{gst_branch}
-%{_libexecdir}/gstreamer-%{gst_branch}/gst-plugin-scanner
-%{_libdir}/*.so.*
-%{_libdir}/girepository-1.0/Gst-1.0.typelib
-%{_libdir}/girepository-1.0/GstBase-1.0.typelib
-%{_libdir}/girepository-1.0/GstCheck-1.0.typelib
-%{_libdir}/girepository-1.0/GstController-1.0.typelib
-%{_libdir}/girepository-1.0/GstNet-1.0.typelib
 
+%define so_version so.0.601.0
+%define so_version_debug %{so_version}.debug
+%define _lib_gstreamer_dir %{_libdir}/gstreamer-%{gst_branch}
+
+%{_lib_gstreamer_dir}/libgstcoreelements.so
+
+%{_libdir}/libgstbase-%{gst_branch}.so
+%{_libdir}/libgstcheck-%{gst_branch}.so
+%{_libdir}/libgstcontroller-%{gst_branch}.so
+%{_libdir}/libgstnet-%{gst_branch}.so
+%{_libdir}/libgstreamer-%{gst_branch}.so
+
+%{_libdir}/libgstbase-%{gst_branch}.so.0
+%{_libdir}/libgstcheck-%{gst_branch}.so.0
+%{_libdir}/libgstcontroller-%{gst_branch}.so.0
+%{_libdir}/libgstnet-%{gst_branch}.so.0
+%{_libdir}/libgstreamer-%{gst_branch}.so.0
+
+%{_libdir}/libgstbase-%{gst_branch}.%{so_version}
+%{_libdir}/libgstcheck-%{gst_branch}.%{so_version}
+%{_libdir}/libgstcontroller-%{gst_branch}.%{so_version}
+%{_libdir}/libgstnet-%{gst_branch}.%{so_version}
+%{_libdir}/libgstreamer-%{gst_branch}.%{so_version}
+
+%{_libdir}/girepository-1.0/Gst-%{gst_branch}.typelib
+%{_libdir}/girepository-1.0/GstBase-%{gst_branch}.typelib
+%{_libdir}/girepository-1.0/GstCheck-%{gst_branch}.typelib
+%{_libdir}/girepository-1.0/GstController-%{gst_branch}.typelib
+%{_libdir}/girepository-1.0/GstNet-%{gst_branch}.typelib
+
+%{_lib_gstreamer_dir}/include/gst/gstconfig.h
+%{_libexecdir}/gstreamer-%{gst_branch}/gst-plugin-scanner
+%{_libexecdir}/gstreamer-%{gst_branch}/gst-ptp-helper
 
 %files utils
 %manifest %{name}.manifest
-%defattr(-, root, root)
-%{_bindir}/*-%{gst_branch}
+%{_bindir}/gst-inspect-%{gst_branch}
+%{_bindir}/gst-launch-%{gst_branch}
+%{_bindir}/gst-typefind-%{gst_branch}
+
 %doc %{_mandir}/man?/*-%{gst_branch}.*
 
+%define _gstinclude_dir %{_includedir}/gstreamer-%{gst_branch}/gst
 
 %files devel
 %manifest %{name}.manifest
-%defattr(-, root, root)
-%{_datadir}/aclocal/*.m4
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
-%{_datadir}/gir-1.0/*.gir
+
+%{_lib_gstreamer_dir}/libgstcoreelements.so
+%{_libdir}/libgstbase-%{gst_branch}.so
+%{_libdir}/libgstcheck-%{gst_branch}.so
+%{_libdir}/libgstcontroller-%{gst_branch}.so
+%{_libdir}/libgstnet-%{gst_branch}.so
+%{_libdir}/libgstreamer-%{gst_branch}.so
+
+%{_libdir}/pkgconfig/gstreamer-%{gst_branch}.pc
+%{_libdir}/pkgconfig/gstreamer-base-%{gst_branch}.pc
+%{_libdir}/pkgconfig/gstreamer-check-%{gst_branch}.pc
+%{_libdir}/pkgconfig/gstreamer-controller-%{gst_branch}.pc
+%{_libdir}/pkgconfig/gstreamer-net-%{gst_branch}.pc
+
+%{_datadir}/aclocal/gst-element-check-1.0.m4
+
+%define gir_dir gir-%{gst_branch}
+
+%{_datadir}/%{gir_dir}/Gst-%{gst_branch}.gir
+%{_datadir}/%{gir_dir}/GstBase-%{gst_branch}.gir
+%{_datadir}/%{gir_dir}/GstCheck-%{gst_branch}.gir
+%{_datadir}/%{gir_dir}/GstController-%{gst_branch}.gir
+%{_datadir}/%{gir_dir}/GstNet-%{gst_branch}.gir
+
+%{_gstinclude_dir}/base/base.h
+%{_gstinclude_dir}/base/gstadapter.h
+%{_gstinclude_dir}/base/gstbaseparse.h
+%{_gstinclude_dir}/base/gstbasesink.h
+%{_gstinclude_dir}/base/gstbasesrc.h
+%{_gstinclude_dir}/base/gstbasetransform.h
+%{_gstinclude_dir}/base/gstbitreader.h
+%{_gstinclude_dir}/base/gstbytereader.h
+%{_gstinclude_dir}/base/gstbytewriter.h
+%{_gstinclude_dir}/base/gstcollectpads.h
+%{_gstinclude_dir}/base/gstdataqueue.h
+%{_gstinclude_dir}/base/gstflowcombiner.h
+%{_gstinclude_dir}/base/gstpushsrc.h
+%{_gstinclude_dir}/base/gstqueuearray.h
+%{_gstinclude_dir}/base/gsttypefindhelper.h
+%{_gstinclude_dir}/check/check.h
+%{_gstinclude_dir}/check/gstbufferstraw.h
+%{_gstinclude_dir}/check/gstcheck.h
+%{_gstinclude_dir}/check/gstconsistencychecker.h
+%{_gstinclude_dir}/check/gstharness.h
+%{_gstinclude_dir}/check/gsttestclock.h
+%{_gstinclude_dir}/check/internal-check.h
+%{_gstinclude_dir}/controller/controller.h
+%{_gstinclude_dir}/controller/gstargbcontrolbinding.h
+%{_gstinclude_dir}/controller/gstdirectcontrolbinding.h
+%{_gstinclude_dir}/controller/gstinterpolationcontrolsource.h
+%{_gstinclude_dir}/controller/gstlfocontrolsource.h
+%{_gstinclude_dir}/controller/gsttimedvaluecontrolsource.h
+%{_gstinclude_dir}/controller/gsttriggercontrolsource.h
+%{_gstinclude_dir}/glib-compat.h
+%{_gstinclude_dir}/gst.h
+%{_gstinclude_dir}/gstallocator.h
+%{_gstinclude_dir}/gstatomicqueue.h
+%{_gstinclude_dir}/gstbin.h
+%{_gstinclude_dir}/gstbuffer.h
+%{_gstinclude_dir}/gstbufferlist.h
+%{_gstinclude_dir}/gstbufferpool.h
+%{_gstinclude_dir}/gstbus.h
+%{_gstinclude_dir}/gstcaps.h
+%{_gstinclude_dir}/gstcapsfeatures.h
+%{_gstinclude_dir}/gstchildproxy.h
+%{_gstinclude_dir}/gstclock.h
+%{_gstinclude_dir}/gstcompat.h
+%{_gstinclude_dir}/gstcontext.h
+%{_gstinclude_dir}/gstcontrolbinding.h
+%{_gstinclude_dir}/gstcontrolsource.h
+%{_gstinclude_dir}/gstdatetime.h
+%{_gstinclude_dir}/gstdebugutils.h
+%{_gstinclude_dir}/gstdevice.h
+%{_gstinclude_dir}/gstdevicemonitor.h
+%{_gstinclude_dir}/gstdeviceprovider.h
+%{_gstinclude_dir}/gstdeviceproviderfactory.h
+%{_gstinclude_dir}/gstelement.h
+%{_gstinclude_dir}/gstelementfactory.h
+%{_gstinclude_dir}/gstelementmetadata.h
+%{_gstinclude_dir}/gstenumtypes.h
+%{_gstinclude_dir}/gsterror.h
+%{_gstinclude_dir}/gstevent.h
+%{_gstinclude_dir}/gstformat.h
+%{_gstinclude_dir}/gstghostpad.h
+%{_gstinclude_dir}/gstinfo.h
+%{_gstinclude_dir}/gstiterator.h
+%{_gstinclude_dir}/gstmacros.h
+%{_gstinclude_dir}/gstmemory.h
+%{_gstinclude_dir}/gstmessage.h
+%{_gstinclude_dir}/gstmeta.h
+%{_gstinclude_dir}/gstminiobject.h
+%{_gstinclude_dir}/gstobject.h
+%{_gstinclude_dir}/gstpad.h
+%{_gstinclude_dir}/gstpadtemplate.h
+%{_gstinclude_dir}/gstparamspecs.h
+%{_gstinclude_dir}/gstparse.h
+%{_gstinclude_dir}/gstpipeline.h
+%{_gstinclude_dir}/gstplugin.h
+%{_gstinclude_dir}/gstpluginfeature.h
+%{_gstinclude_dir}/gstpoll.h
+%{_gstinclude_dir}/gstpreset.h
+%{_gstinclude_dir}/gstprotection.h
+%{_gstinclude_dir}/gstquery.h
+%{_gstinclude_dir}/gstregistry.h
+%{_gstinclude_dir}/gstsample.h
+%{_gstinclude_dir}/gstsegment.h
+%{_gstinclude_dir}/gststructure.h
+%{_gstinclude_dir}/gstsystemclock.h
+%{_gstinclude_dir}/gsttaglist.h
+%{_gstinclude_dir}/gsttagsetter.h
+%{_gstinclude_dir}/gsttask.h
+%{_gstinclude_dir}/gsttaskpool.h
+%{_gstinclude_dir}/gsttoc.h
+%{_gstinclude_dir}/gsttocsetter.h
+%{_gstinclude_dir}/gsttypefind.h
+%{_gstinclude_dir}/gsttypefindfactory.h
+%{_gstinclude_dir}/gsturi.h
+%{_gstinclude_dir}/gstutils.h
+%{_gstinclude_dir}/gstvalue.h
+%{_gstinclude_dir}/gstversion.h
+%{_gstinclude_dir}/math-compat.h
+%{_gstinclude_dir}/net/gstnet.h
+%{_gstinclude_dir}/net/gstnetaddressmeta.h
+%{_gstinclude_dir}/net/gstnetclientclock.h
+%{_gstinclude_dir}/net/gstnetcontrolmessagemeta.h
+%{_gstinclude_dir}/net/gstnettimepacket.h
+%{_gstinclude_dir}/net/gstnettimeprovider.h
+%{_gstinclude_dir}/net/gstptpclock.h
+%{_gstinclude_dir}/net/net.h
 
 %changelog

diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c
index d9dd069..fbbf107 100644 (file)
--- a/plugins/elements/gstqueue2.c
+++ b/plugins/elements/gstqueue2.c
@@ -265,6 +265,9 @@ static gboolean gst_queue2_is_filled (GstQueue2 * queue);
 static void update_cur_level (GstQueue2 * queue, GstQueue2Range * range);
 static void update_in_rates (GstQueue2 * queue);
 static void gst_queue2_post_buffering (GstQueue2 * queue);
+#ifdef GST_QUEUE2_MODIFICATION
+static gboolean change_current_range(GstQueue2 * queue, GstQueue2Range *req_range, guint64 offset, guint length);
+#endif
 
 typedef enum
 {
@@ -953,6 +956,14 @@ static void
 update_buffering (GstQueue2 * queue)
 {
   gint percent;
+#ifdef GST_QUEUE2_MODIFICATION
+  GstQueue2Range *range;
+
+  if (queue->read)
+    range = queue->read;
+  else
+    range = queue->current;
+#endif
 
   /* Ensure the variables used to calculate buffering state are up-to-date. */
 #ifdef GST_QUEUE2_MODIFICATION
@@ -3203,8 +3214,11 @@ gst_queue2_handle_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
     {
       gboolean pull_mode;
       GstSchedulingFlags flags = 0;
-
+#ifdef GST_QUEUE2_MODIFICATION
       if ((!QUEUE_IS_USING_QUEUE (queue)) && !gst_pad_peer_query (queue->sinkpad, query))
+#else
+      if (!gst_pad_peer_query (queue->sinkpad, query))
+#endif
         goto peer_failed;
 
       gst_query_parse_scheduling (query, &flags, NULL, NULL, NULL);