Update spec file and meson files

Change-Id: I155c032e191ebbc0bcfaf62e6904c1ad28f5dfee
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/meson.build b/meson.build
index 9657282..bcb793a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -268,7 +268,16 @@ libm = cc.find_library('m', required: false)
 
 nice_incs = include_directories('.', 'agent', 'random', 'socket', 'stun')
 
-nice_deps = gio_deps + [gthread_dep, crypto_dep, gupnp_igd_dep] + syslibs
+# Tizen modification
+if get_option('dlog')
+  dlog_dep = dependency('dlog', required: true)
+  if dlog_dep.found()
+    cdata.set('USE_DLOG', true)
+    nice_deps = gio_deps + [gthread_dep, crypto_dep, gupnp_igd_dep, dlog_dep] + syslibs
+  endif
+else
+  nice_deps = gio_deps + [gthread_dep, crypto_dep, gupnp_igd_dep] + syslibs
+endif
 
 ignored_iface_prefix = get_option('ignored-network-interface-prefix')
 if ignored_iface_prefix != []

diff --git a/meson_options.txt b/meson_options.txt
index cd980cb..c3534c4 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,17 +1,21 @@
 option('gupnp', type: 'feature', value: 'auto',
   description: 'Enable or disable GUPnP IGD support')
-option('gstreamer', type: 'feature', value: 'auto',
+option('gstreamer', type: 'feature', value: 'disabled',
   description: 'Enable or disable build of GStreamer plugins')
 option('ignored-network-interface-prefix', type: 'array', value: ['docker', 'veth', 'virbr', 'vnet'],
   description: 'Ignore network interfaces whose name starts with a string from this list in the ICE connection check algorithm. For example, "virbr" to ignore virtual bridge interfaces added by virtd, which do not help in finding connectivity.')
 option('crypto-library', type: 'combo', choices : ['auto', 'gnutls', 'openssl'], value : 'auto')
 
 # Common feature options
-option('examples', type : 'feature', value : 'auto', yield : true,
+option('examples', type : 'feature', value : 'disabled', yield : true,
   description: 'Build examples')
-option('tests', type : 'feature', value : 'auto', yield : true,
+option('tests', type : 'feature', value : 'disabled', yield : true,
   description: 'Enable or disable unit tests')
 option('gtk_doc', type : 'feature', value : 'disabled', yield : true,
   description: 'Generate API documentation with gtk-doc')
 option('introspection', type : 'feature', value : 'auto', yield : true,
   description : 'Generate gobject-introspection bindings')
+
+# Tizen modification options
+option('dlog', type : 'boolean', value : false, description: 'Use dlog')
+

diff --git a/packaging/libnice.spec b/packaging/libnice.spec
index e494b05..98737bd 100644 (file)
--- a/packaging/libnice.spec
+++ b/packaging/libnice.spec
@@ -1,13 +1,14 @@
 Name:       libnice
 Summary:    Library for implementing Interactive Connectivity Establishment (ICE) standard (RFC 5245 & RFC 8445)
-Version:    0.1.17
-Release:    3
+Version:    0.1.18
+Release:    1
 Group:      Multimedia/Libraries
 License:    LGPL-2.1
 Source0:    %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+BuildRequires: meson >= 0.52.0
 BuildRequires: pkgconfig(glib-2.0) >= 2.32.0
 BuildRequires: pkgconfig(openssl1.1)
 BuildRequires: pkgconfig(dlog)
@@ -28,23 +29,15 @@ nice headers and libraries for development.
 cp %{SOURCE1001} .
 
 %build
-export NOCONFIGURE=1
-%autogen
-%configure \
-       --disable-static \
-       --disable-gtk-doc \
-       --disable-gtk-doc-html \
-       --disable-gtk-doc-pdf \
-       --enable-dlog
-
-make %{?jobs:-j%jobs}
+meson --auto-features=disabled --prefix=/usr --libdir=%{_libdir} --datadir=%{_datadir} build
+ninja -C build
 
 %install
 rm -rf %{buildroot}
-%make_install
+export DESTDIR=%{buildroot}
+ninja -C build install
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %files