Merge the tizen patch and fix build err based on 1.12.2

Change-Id: I59d8eb2e78ad3fe64417f447f65fa0abd1fd201d

diff --cc .gbs.conf
index 0000000,7302e56..3033b86
mode 000000,100644..100644
--- /dev/null
--- 2/.gbs.conf
+++ b/.gbs.conf
@@@ -1,0 -1,3 +1,3 @@@
 -upstream_branch = upstream/1.6
+ [general]
++upstream_branch = upstream/1.12
+ upstream_tag = ${upstreamversion}

diff --cc Makefile.am
index 214f1b0,72f77b1..36682a2
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -1,14 -1,17 +1,14 @@@
- DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+ DISTCHECK_CONFIGURE_FLAGS=--disable-gtk-doc
  
  SUBDIRS = \
-       gst-libs gst ext docs m4 tests common pkgconfig po
+       gst-libs gst ext m4 tests common pkgconfig po
 -
 -# include before EXTRA_DIST for win32 assignment
 -include $(top_srcdir)/common/win32.mak
 -
 +      
  EXTRA_DIST = \
 -      gst-plugins-ugly.spec depcomp \
 +      depcomp \
        AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \
        ChangeLog gst-plugins-ugly.doap autogen.sh \
 -      $(win32)
 -
 +      $(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/$(PACKAGE_TARNAME)-*" ) \
 +      meson_options.txt config.h.meson
  
  DISTCLEANFILES = _stdint.h
  

diff --cc ext/dvdread/dvdreadsrc.c
Simple merge

diff --cc gst/dvdsub/gstdvdsubparse.c
Simple merge

diff --cc packaging/common.tar.gz
index 0000000,8789ff0..c3aef17
mode 000000,100644..100644
Binary files differ

diff --cc packaging/gst-plugins-ugly.spec
index 0000000,290b573..d16ed98
mode 000000,100644..100644
--- /dev/null
--- 2/packaging/gst-plugins-ugly.spec
+++ b/packaging/gst-plugins-ugly.spec
@@@ -1,0 -1,73 +1,73 @@@
 -Version:    1.6.1
 -Release:    1
+ Name:       gst-plugins-ugly
+ Summary:    GStreamer plugins from the "ugly" set
++Version:    1.12.2
++Release:    0
+ Group:      Multimedia/Framework
+ License:    LGPL-2.1+
+ Source:     http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{version}.tar.xz
+ Source100:  common.tar.gz
+ 
+ BuildRequires:  gettext-tools
+ BuildRequires:  which
+ BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
+ BuildRequires:  pkgconfig(gstreamer-1.0)
+ BuildRequires:  pkgconfig(glib-2.0)
+ BuildRequires:  pkgconfig(opencore-amrnb)
+ BuildRequires:  pkgconfig(opencore-amrwb)
+ 
+ %description
+  GStreamer is a streaming media framework, based on graphs of filters
+  which operate on media data.  Applications using this library can do
+  anything from real-time sound processing to playing videos, and just
+  about anything else media-related.  Its plugin-based architecture means
+  that new data types or processing capabilities can be added simply by
+  installing new plug-ins.
+  .
+  This packages contains plugins from the "ugly" set, a set of
+  good-quality plug-ins that might pose distribution problems.
+ 
+ %prep
+ %setup -q -n gst-plugins-ugly-%{version}
+ %setup -q -T -D -a 100
+ 
+ %build
+ export V=1
+ NOCONFIGURE=1 ./autogen.sh
+ %configure \
+  --disable-static\
+  --disable-nls\
+  --with-html-dir=/tmp/dump\
+  --disable-examples\
+  --disable-dvdlpcmdec\
+  --disable-dvdsub\
+  --disable-iec958\
+  --disable-mpegstream\
+  --disable-synaesthesia\
+  --disable-a52dec\
+  --disable-cdio\
+  --disable-dvdread\
+  --disable-dvdnav\
+  --disable-mad\
+  --disable-mpeg2dec\
+  --disable-sidplay\
+  --disable-twolame\
+  --disable-realmedia\
+  --disable-xingmux\
+  --disable-x264\
+  --disable-gtk-doc\
+  --disable-gtk-doc-html
+ make %{?jobs:-j%jobs}
+ 
+ %install
+ %make_install
+ 
+ %files
+ %manifest %{name}.manifest
+ %defattr(-,root,root,-)
+ %license COPYING
+ %{_libdir}/gstreamer-1.0/libgstasf.so
+ %{_libdir}/gstreamer-1.0/libgstamrnb.so
+ %{_libdir}/gstreamer-1.0/libgstamrwbdec.so
+ %exclude %{_datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs
+ 
+