apply meson option and fix build error

- apply meson option
- fix packaging error
- .gbs.conf will be applied after

Change-Id: Ic53c05c010f88e43500fbd09334f0d12f1a38aa5

diff --git a/.gbs.conf b/.gbs.conf
deleted file mode 100644 (file)
index 8d1776a..0000000
--- a/.gbs.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[general]
-upstream_branch = upstream/1.16
-upstream_tag = ${upstreamversion}

diff --git a/gst/meson.build b/gst/meson.build
index c70998cdaf299a68dd88f4b44682faecd833d168..7c019508bc3b8c1e3250b7132d09723f38ee5500 100644 (file)
--- a/gst/meson.build
+++ b/gst/meson.build
@@ -246,7 +246,7 @@ libgst = library('gstreamer-1.0', gst_sources,
     # HACK, change include paths in .y and .l in final version.
     include_directories('parse')],
   install : true,
-  dependencies : [gobject_dep, gmodule_dep, glib_dep, mathlib, dl_dep] + backtrace_deps
+  dependencies : [gobject_dep, gmodule_dep, glib_dep, mathlib, dl_dep, dlog_dep] + backtrace_deps
                    + platform_deps,
 )
 

diff --git a/meson.build b/meson.build
index bed8c4e1aabaa6fcf5bf72f4fb81e6278f8a247e..34e48d233d8fd049659a61c98d562b02420e9c4a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -562,6 +562,20 @@ if bashcomp_dep.found()
   endif
 endif
 
+# TIZEN BUILD OPTION
+
+dlog_dep = dependency('dlog', required : get_option('dlog'))
+if dlog_dep.found()
+  cdata.set('TIZEN_DLOG', 1)
+endif
+
+tv_dep = dependency('tv-profile', required : get_option('tv-profile'))
+if tv_dep.found()
+  cdata.set('TIZEN_TV_PROFILE', 1)
+endif
+
+# TIZEN BUILD OPTION end
+
 plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0')
 
 pkgconfig = import('pkgconfig')

diff --git a/meson_options.txt b/meson_options.txt
index 7363bdb7a1549f1ef861e02875ccbaeb85b70066..ab9c7bd5455640c3e939aa5aae5c23b9517f92e5 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -46,3 +46,9 @@ option('package-origin', type : 'string', value : 'Unknown package origin', yiel
        description : 'package origin URL to use in plugins')
 option('doc', type : 'feature', value : 'auto', yield: true,
        description: 'Enable documentation.')
+
+# Tizen options
+option('dlog', type : 'boolean', value : true,
+       description : 'dlog')
+option('tv-profile', type : 'boolean', value : false,
+       description : 'tv-profile')
\ No newline at end of file

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

diff --git a/packaging/gstreamer.manifest b/packaging/gstreamer.manifest
new file mode 100644 (file)
index 0000000..017d22d
--- /dev/null
+++ b/packaging/gstreamer.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>

diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec
index 39e489cfff843ffde11df17a1fbba5c73950b595..2fe94c830bbf18d59ccf01d35c84bf715a05b689 100644 (file)
--- a/packaging/gstreamer.spec
+++ b/packaging/gstreamer.spec
@@ -8,7 +8,7 @@ License:        LGPL-2.0+
 Group:          Multimedia/Framework
 Url:            http://gstreamer.freedesktop.org/
 Source0:        http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.xz
-Source100:      common.tar.gz
+Source1001:     gstreamer.manifest
 BuildRequires:  meson >= 0.48.0
 BuildRequires:  bison
 BuildRequires:  gettext-tools
@@ -59,7 +59,7 @@ to develop applications that require these.
 
 %prep
 %setup -q -n gstreamer-%{version}
-%setup -q -T -D -a 100
+cp %{SOURCE1001} .
 
 %build
 export CFLAGS="%{optflags} \
@@ -90,6 +90,9 @@ export CFLAGS="%{optflags} \
   -D examples=disabled \
   -D tests=disabled \
   -D doc=disabled \
+%if "%{tizen_profile_name}" == "tv"
+  -D tv-profile=true \
+%endif
   -D ptp-helper-permissions=none
 
 %meson_build
@@ -103,6 +106,7 @@ mv %{name}-%{gst_branch}.lang %{name}.lang
 rm -rf %{buildroot}%{_datadir}/gtk-doc
 rm -rf %{buildroot}%{_docdir}/%{name}/manual
 rm -rf %{buildroot}%{_docdir}/%{name}/pwg
+rm -rf %{buildroot}%{_libexecdir}/gstreamer-%{gst_branch}/gst-plugins-doc-cache-generator
 mkdir -p %{buildroot}%{_datadir}/gstreamer-%{gst_branch}/presets
 %fdupes %{buildroot}
 
@@ -121,6 +125,7 @@ mkdir -p %{buildroot}%{_datadir}/gstreamer-%{gst_branch}/presets
 %{_libdir}/gstreamer-%{gst_branch}/*.so
 %dir %{_libexecdir}/gstreamer-%{gst_branch}
 %{_libexecdir}/gstreamer-%{gst_branch}/gst-plugin-scanner
+%{_libexecdir}/gstreamer-%{gst_branch}/gst-hotdoc-plugins-scanner
 %{_libexecdir}/gstreamer-%{gst_branch}/gst-ptp-helper
 %{_libdir}/*.so.*
 %{_libdir}/girepository-1.0/Gst-1.0.typelib