Merge branch 'tizen' into 'tizen_gst_1.19.2'

Change-Id: I55b6ae1068fdcf7cad6d59825271d4e2a34bc024

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

diff --cc gst/asfdemux/gstasfdemux.c
Simple merge

diff --cc gst/asfdemux/gstasfdemux.h
Simple merge

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

diff --cc meson.build
index c5c78fc,e69282a..e92919e
--- 1/meson.build
--- 2/meson.build
+++ b/meson.build
@@@ -185,6 -170,6 +185,15 @@@ els
    gst_debug_disabled = cc.has_header_symbol('gst/gstconfig.h', 'GST_DISABLE_GST_DEBUG', dependencies: gst_dep)
  endif
  
++# TIZEN_OPTION
++
++if get_option('tv-profile')
++  core_conf.set('TIZEN_TV_PROFILE', 1)
++  core_conf.set('TIZEN_FEATURE_TRUSTZONE', 1)
++endif
++
++# TIZEN_OPTION end
++
  if gst_debug_disabled
    message('GStreamer debug system is disabled')
    if cc.has_argument('-Wno-unused')

diff --cc meson_options.txt
index 0b59d01,3e2374d..f20dfe3
--- 1/meson_options.txt
--- 2/meson_options.txt
+++ b/meson_options.txt
@@@ -35,5 -35,3 +35,9 @@@ option('package-name', type : 'string'
         description : 'package name to use in plugins')
  option('package-origin', type : 'string', value : 'Unknown package origin', yield: true,
         description : 'package origin URL to use in plugins')
-        description: 'Enable documentation.')
 +option('doc', type : 'feature', value : 'auto', yield: true,
++       description: 'Enable documentation.')
++
++# Tizen Options
++option('tv-profile', type : 'boolean', value : false,
++       description : 'tv-profile')

diff --cc packaging/gst-plugins-ugly.manifest
index 0000000,97e8c31..97e8c31
mode 000000,100644..100644
--- /dev/null
--- 2/gst-plugins-ugly.manifest
+++ b/packaging/gst-plugins-ugly.manifest

diff --cc packaging/gst-plugins-ugly.spec
index 0000000,4d2f81f..8d36992
mode 000000,100644..100644
--- /dev/null
--- 2/packaging/gst-plugins-ugly.spec
+++ b/packaging/gst-plugins-ugly.spec
@@@ -1,0 -1,92 +1,86 @@@
 -Version:    1.16.2
++%define gst_branch 1.0
++
+ Name:       gst-plugins-ugly
+ Summary:    GStreamer plugins from the "ugly" set
 -Source100:  common.tar.gz
++Version:    1.19.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
 -BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
 -BuildRequires:  pkgconfig(gstreamer-1.0)
++Source1001: gst-plugins-ugly.manifest
+ 
++BuildRequires:  meson >= 0.48.0
+ BuildRequires:  gettext-tools
+ BuildRequires:  which
 -%setup -q -T -D -a 100
++#BuildRequires:  pkgconfig(gstreamer-1.0)
++#BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
++BuildRequires:  gstreamer-devel >= %{version}
++BuildRequires:  gst-plugins-base-devel >= %{version}
++
+ BuildRequires:  pkgconfig(glib-2.0)
+ %if "%{tizen_profile_name}" != "tv"
+ BuildRequires:  pkgconfig(opencore-amrnb)
+ %endif
+ 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}
 -export V=1
 -NOCONFIGURE=1 ./autogen.sh
++cp %{SOURCE1001} .
+ 
+ %build
 -%if "%{tizen_profile_name}" == "tv"
 -      -DTIZEN_FEATURE_TRUSTZONE\
 -%endif
++mkdir -p build
+ 
+ export CFLAGS="\
 -%configure \
+       -DTIZEN_FEATURE_ASFDEMUX_CHECK_DATA_SIZE\
+       -DTIZEN_FEATURE_ASFDEMUX_DISABLE_UNSUPPORTED_FORMAT\
+       -DTIZEN_FEATURE_ASFDEMUX_POST_TAG_MSG\
+       -fstack-protector-strong\
+       -Wl,-z,relro\
+       -D_FORTIFY_SOURCE=2"
+ 
 - --disable-amrnb\
 - --disable-asfdemux\
 - --disable-lame\
++meson --auto-feature=auto --prefix=/usr --libdir=%{_libdir} --datadir=%{_datadir} \
+ %if "%{tizen_profile_name}" == "tv"
 - --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}
++ -D tv-profile=true \
++ -D amrnb=disabled \
++ -D asfdemux=disabled \
+ %endif
 -%make_install
++ -D nls=disabled \
++ -D dvdlpcmdec=disabled \
++ -D dvdsub=disabled \
++ -D mpeg2dec=disabled \
++ -D a52dec=disabled \
++ -D cdio=disabled \
++ -D dvdread=disabled \
++ -D sidplay=disabled \
++ -D realmedia=disabled \
++ -D xingmux=disabled \
++ -D x264=disabled \
++ -D doc=disabled build
++
++ninja -C build all %{?_smp_mflags}
+ 
+ %install
 -%{_libdir}/gstreamer-1.0/libgstasf.so
 -%{_libdir}/gstreamer-1.0/libgstamrnb.so
 -%exclude %{_datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs
++export DESTDIR=%{buildroot}
++ninja -C build install
+ 
+ %files
+ %manifest %{name}.manifest
+ %defattr(-,root,root,-)
+ %license COPYING
+ %if "%{tizen_profile_name}" != "tv"
 -%{_libdir}/gstreamer-1.0/libgstamrwbdec.so
++%{_libdir}/gstreamer-%{gst_branch}/libgstasf.so
++%{_libdir}/gstreamer-%{gst_branch}/libgstamrnb.so
++%exclude %{_datadir}/gstreamer-%{gst_branch}/presets/GstAmrnbEnc.prs
+ %endif
++%{_libdir}/gstreamer-%{gst_branch}/libgstamrwbdec.so