Move the defines from spec to meson.build

Change-Id: I87e1dc60270aba0c3318bfea294c65771de982c1

diff --git a/ext/hls/m3u8.c b/ext/hls/m3u8.c
index 6299907..892d1b6 100644 (file)
--- a/ext/hls/m3u8.c
+++ b/ext/hls/m3u8.c
@@ -20,6 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <math.h>
 #include <errno.h>
@@ -140,7 +144,7 @@ gst_m3u8_unref (GstM3U8 * self)
 #ifdef TIZEN_FEATURE_AD
     if (self->ad_info) {
       g_list_free (self->ad_info->cue);
-      g_list_free_full(self->ad_info->cue_cont, (GFunc) gst_m3u8_cue_cont_free);
+      g_list_free_full(self->ad_info->cue_cont, (GDestroyNotify) gst_m3u8_cue_cont_free);
       g_free (self->ad_info);
     }
 #endif

diff --git a/ext/webrtc/gstwebrtcbin.c b/ext/webrtc/gstwebrtcbin.c
index e37074b..95bd271 100644 (file)
--- a/ext/webrtc/gstwebrtcbin.c
+++ b/ext/webrtc/gstwebrtcbin.c
@@ -1256,7 +1256,9 @@ _update_and_notify_ice_gathering_state (GstWebRTCBin * webrtc, GstWebRTCICEGathe
 static GstStructure *
 _update_ice_gathering_state_task (GstWebRTCBin * webrtc, gpointer data)
 {
+#ifndef __TIZEN__
   GstWebRTCICEGatheringState old_state = webrtc->ice_gathering_state;
+#endif
   GstWebRTCICEGatheringState new_state;
 
   new_state = _collate_ice_gathering_states (webrtc);

diff --git a/meson.build b/meson.build
index 7cab556..6b32a4f 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -421,6 +421,28 @@ if host_system == 'android'
   gnustl_dep = dependency('gnustl', required : false)
 endif
 
+# TIZEN BUILD OPTION
+cdata.set('TIZEN_FEATURE_ADAPTIVE_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_HLSDEMUX_PROPERTY', true)
+cdata.set('TIZEN_FEATURE_HLSDEMUX_EMPTY_VTT', true)
+cdata.set('TIZEN_FEATURE_HLSDEMUX_UPDATE_SEGMENT', true)
+cdata.set('TIZEN_FEATURE_HLSDEMUX_DISCONT_SEQUENCE', true)
+cdata.set('TIZEN_FEATURE_TSDEMUX_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_TSDEMUX_INVALID_PCR_PID', true)
+cdata.set('TIZEN_FEATURE_TSDEMUX_LANG_TAG', true)
+cdata.set('TIZEN_FEATURE_TSDEMUX_UPDATE_PMT', true)
+cdata.set('TIZEN_FEATURE_TSDEMUX_UPDATE_STREAM', true)
+cdata.set('TIZEN_FEATURE_HLS_WEBVTT', true)
+cdata.set('TIZEN_FEATURE_OALSINK_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_MPEGDEMUX_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_H264PARSE_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_AD', true)
+cdata.set('TIZEN_FEATURE_HLSDEMUX_LANG_TAG', true)
+cdata.set('TIZEN_FEATURE_HLSDEMUX_DISCONT', true)
+cdata.set('TIZEN_FEATURE_IMPORT_NETSIM', true)
+cdata.set('TIZEN_FEATURE_PITCH_AUDIO_META', true)
+# TIZEN BUILD OPTION end
+
 # Disable compiler warnings for unused variables and args if gst debug system is disabled
 if gst_dep.type_name() == 'internal'
   gst_debug_disabled = not subproject('gstreamer').get_variable('gst_debug')

diff --git a/packaging/gst-plugins-bad.spec b/packaging/gst-plugins-bad.spec
index 918d84e..498a46d 100644 (file)
--- a/packaging/gst-plugins-bad.spec
+++ b/packaging/gst-plugins-bad.spec
@@ -78,33 +78,13 @@ cp %{SOURCE1001} .
 mkdir -p build
 
 export CFLAGS+=" -Wall -g -fPIC\
-  -DTIZEN_FEATURE_ADAPTIVE_MODIFICATION\
-  -DTIZEN_FEATURE_HLSDEMUX_PROPERTY\
-  -DTIZEN_FEATURE_HLSDEMUX_EMPTY_VTT\
-  -DTIZEN_FEATURE_HLSDEMUX_UPDATE_SEGMENT\
-  -DTIZEN_FEATURE_HLSDEMUX_DISCONT_SEQUENCE\
-  -DTIZEN_FEATURE_TSDEMUX_MODIFICATION\
-  -DTIZEN_FEATURE_TSDEMUX_INVALID_PCR_PID\
-  -DTIZEN_FEATURE_TSDEMUX_LANG_TAG\
-  -DTIZEN_FEATURE_TSDEMUX_UPDATE_PMT\
-  -DTIZEN_FEATURE_TSDEMUX_UPDATE_STREAM\
-  -DTIZEN_FEATURE_HLS_WEBVTT\
-  -DTIZEN_FEATURE_OALSINK_MODIFICATION\
-  -DTIZEN_FEATURE_MPEGDEMUX_MODIFICATION\
-  -DTIZEN_FEATURE_H264PARSE_MODIFICATION\
-  -DTIZEN_FEATURE_AD\
-  -DTIZEN_FEATURE_HLSDEMUX_LANG_TAG\
-  -DTIZEN_FEATURE_HLSDEMUX_DISCONT\
-  -DTIZEN_FEATURE_IMPORT_NETSIM\
-  -D__TIZEN__\
   -fstack-protector-strong\
   -Wl,-z,relro\
   -D_FORTIFY_SOURCE=2"
-export CXXFLAGS+=" -DTIZEN_FEATURE_PITCH_AUDIO_META"
 # export pthread for checking usrsctp_init at sctp configure
 export LDFLAGS+=" -pthread "
 
-meson --auto-feature=auto --prefix=/usr --libdir=%{_libdir} --datadir=%{_datadir} \
+meson --prefix=/usr --libdir=%{_libdir} --datadir=%{_datadir} \
        -D gst_play_tests=false\
 %if "%{tizen_profile_name}" == "tv"
        -D tv-profile=false \