Merge branch 'tizen' into tizen_gst_1.19.2

Change-Id: I3806ab340e71edb091ae34d7b2f9016d636454cb

diff --cc packaging/gst-editing-services.manifest
index 0000000,017d22d..017d22d
mode 000000,100644..100644
--- /dev/null
--- 2/gst-editing-services.manifest
+++ b/packaging/gst-editing-services.manifest

diff --cc packaging/gst-editing-services.spec
index 0000000,43cd0d2..956cb9c
mode 000000,100644..100644
--- /dev/null
--- 2/packaging/gst-editing-services.spec
+++ b/packaging/gst-editing-services.spec
@@@ -1,0 -1,85 +1,92 @@@
 -Version:        1.16.2
 -Release:        1
+ %define gst_branch 1.0
+ %define _lib_gstreamer_dir %{_libdir}/gstreamer-%{gst_branch}
+ %define _libdebug_dir %{_libdir}/debug/usr/lib
+ 
+ Name:           gst-editing-services
 -Source100:      common.tar.gz
++Version:        1.19.2
++Release:        0
+ License:        LGPL-2.0+
+ Summary:        GStreamer Editing Service Plug-Ins
+ Url:            http://gstreamer.freedesktop.org/
+ Group:          Multimedia/Framework
+ Source:         http://gstreamer.freedesktop.org/src/gst-editing-services/gst-editing-services-%{version}.tar.xz
 -BuildRequires:  pkgconfig(gstreamer-1.0)
 -BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
++Source1001:     gst-editing-services.manifest
+ 
 -BuildRequires:  autoconf automake libtool
++BuildRequires:  gstreamer-devel >= %{version}
++BuildRequires:  gst-plugins-base-devel >= %{version}
+ BuildRequires:  pkgconfig(libxml-2.0)
 -%setup -q -T -D -a 100
++#BuildRequires:  autoconf automake libtool
+ BuildRequires:  gobject-introspection-devel
+ BuildRequires:  gtk-doc
+ BuildRequires:  flex
++BuildRequires:  meson >= 0.48.0
+ 
+ Requires:       gstreamer >= 1.0.0
+ Supplements:    gstreamer
+ 
+ %description
+ This is a high-level library for facilitating the creation of audio/video
+ non-linear editors.
+ 
+ %package devel
+ Summary: Development files for gst-editing-services
+ License: GPLv2+ and LGPLv2+
+ Requires: %{name} = %{version}-%{release}
+ 
+ %description devel
+ This package contains libraries and header files for
+ developing applications that use %{name}
+ 
+ %prep
+ %setup -q -n gst-editing-services-%{version}
 -./autogen.sh
++cp %{SOURCE1001} .
+ 
+ %build
 -%configure\
 -        --disable-static\
 -        --disable-maintainer-mode\
 -        --disable-gtk-doc\
 -        --disable-docbook\
 -        --disable-examples\
 -        --enable-tbm
 -make %{?_smp_mflags} V=1
++mkdir -p build
++
+ export CFLAGS="%{optflags} -fno-strict-aliasing\
+  -fstack-protector-strong\
+  -Wl,-z,relro\
+  -D_FORTIFY_SOURCE=2\
+  "
+ 
 -%make_install
++meson --auto-feature=auto --prefix=/usr --libdir=%{_libdir} --datadir=%{_datadir} \
++  -D doc=disabled \
++  -D examples=disabled \
++  -D tests=disabled \
++  -D bash-completion=disabled \
++  -D validate=disabled \
++  build
++
++ninja -C build all %{?_smp_mflags}
+ find . -name '.gitignore' | xargs rm -f
+ 
+ %install
+ rm -rf %{buildroot}
+ 
++export DESTDIR=%{buildroot}
++ninja -C build install
+ 
+ %post -p /sbin/ldconfig
+ 
+ %postun -p /sbin/ldconfig
+ 
+ %files
+ %manifest %{name}.manifest
+ %defattr(-, root, root)
+ %license COPYING
+ 
+ %{_libdir}/*.so.*
+ %{_lib_gstreamer_dir}/*.so
+ %{_libdir}/girepository-1.0/GES-1.0.typelib
+ 
++%exclude %{_libdir}/gst-validate-launcher/python/launcher/apps/geslaunch.py
++%exclude %{_datadir}/gstreamer-%{gst_branch}/validate/scenarios/ges-edit-clip-while-paused.scenario
++
+ %{_bindir}/*-%{gst_branch}
+ 
+ %files devel
+ %{_libdir}/*.so
+ %{_includedir}/gstreamer-1.0/ges/
+ %{_libdir}/pkgconfig/gst-editing-services-1.0.pc
+ %{_datadir}/gir-1.0/GES-1.0.gir

diff --cc tools/meson.build
index f0726ab,60fe5ed..a3c7a29
--- 1/tools/meson.build
--- 2/tools/meson.build
+++ b/tools/meson.build
@@@ -13,41 -13,4 +13,41 @@@ ges_launch = executable('ges-launch-@0@
      install: true
  )
  
--install_man('ges-launch-1.0.1')
++#install_man('ges-launch-1.0.1')
 +
 +# bash completion
 +bashcomp_option = get_option('bash-completion')
 +bashcomp_dep = dependency('bash-completion', version : '>= 2.0', required : bashcomp_option)
 +bash_completions_dir = ''
 +bash_helpers_dir = ''
 +
 +bashcomp_found = false
 +if bashcomp_dep.found()
 +  bashcomp_found = true
 +  bashcomp_dir_override = bashcomp_dep.version().version_compare('>= 2.10') ? ['datadir', datadir] : ['prefix', prefix]
 +  bash_completions_dir = bashcomp_dep.get_pkgconfig_variable('completionsdir', define_variable: bashcomp_dir_override)
 +  if bash_completions_dir == ''
 +    msg = 'Found bash-completion but the .pc file did not set \'completionsdir\'.'
 +    if bashcomp_option.enabled()
 +      error(msg)
 +    else
 +      message(msg)
 +    endif
 +    bashcomp_found = false
 +  endif
 +
 +  bash_helpers_dir = bashcomp_dep.get_pkgconfig_variable('helpersdir', define_variable: bashcomp_dir_override)
 +  if bash_helpers_dir == ''
 +    msg = 'Found bash-completion, but the .pc file did not set \'helpersdir\'.'
 +    if bashcomp_option.enabled()
 +      error(msg)
 +    else
 +      message(msg)
 +    endif
 +    bashcomp_found = false
 +  endif
 +
 +  if bashcomp_found
 +    install_data('../data/completions/ges-launch-1.0', install_dir : bash_completions_dir)
 +  endif
 +endif