Move the defines from spec to meson.build

- Change file permission 755 to 644
- Remove white space

Change-Id: I4d27826eed80c5698dd30f0b989429af36cf4e9f

diff --git a/gst-libs/gst/allocators/allocators.h b/gst-libs/gst/allocators/allocators.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/gst-libs/gst/app/gstappsink.h b/gst-libs/gst/app/gstappsink.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/gst/subparse/samiparse.c b/gst/subparse/samiparse.c
index 34355e8..5227247 100644 (file)
--- a/gst/subparse/samiparse.c
+++ b/gst/subparse/samiparse.c
@@ -17,6 +17,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "samiparse.h"
 
 #include <glib.h>

diff --git a/gst/typefind/gsttypefindfunctionsriff.c b/gst/typefind/gsttypefindfunctionsriff.c
index 9e7cf17..c21a44f 100644 (file)
--- a/gst/typefind/gsttypefindfunctionsriff.c
+++ b/gst/typefind/gsttypefindfunctionsriff.c
@@ -71,17 +71,17 @@ G_END_DECLS
 /*RIFF type find definition */
 TYPE_FIND_REGISTER_RIFF_DEFINE (avi, "video/x-msvideo", GST_RANK_PRIMARY,
     "avi", "AVI ");
-#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES       
+#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES
 TYPE_FIND_REGISTER_RIFF_DEFINE (qcp, "audio/qcelp", GST_RANK_PRIMARY,
     "qcp", "QLCM");
 TYPE_FIND_REGISTER_RIFF_DEFINE (cdxa, "video/x-cdxa", GST_RANK_PRIMARY,
     "dat", "CDXA");
-#endif 
+#endif
 TYPE_FIND_REGISTER_RIFF_DEFINE (riff_mid, "audio/riff-midi",
     GST_RANK_PRIMARY, "mid,midi", "RMID");
 TYPE_FIND_REGISTER_RIFF_DEFINE (wav, "audio/x-wav", GST_RANK_PRIMARY, "wav",
     "WAVE");
-#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES       
+#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES
 TYPE_FIND_REGISTER_RIFF_DEFINE (webp, "image/webp", GST_RANK_PRIMARY,
     "webp", "WEBP");
-#endif 
+#endif

diff --git a/gst/typefind/gsttypefindfunctionsstartwith.c b/gst/typefind/gsttypefindfunctionsstartwith.c
index ec384af..3174c1e 100644 (file)
--- a/gst/typefind/gsttypefindfunctionsstartwith.c
+++ b/gst/typefind/gsttypefindfunctionsstartwith.c
@@ -74,11 +74,11 @@ TYPE_FIND_REGISTER_START_WITH_DEFINE (asf, "video/x-ms-asf",
     GST_RANK_SECONDARY, "asf,wm,wma,wmv",
     "\060\046\262\165\216\146\317\021\246\331\000\252\000\142\316\154", 16,
     GST_TYPE_FIND_MAXIMUM);
-#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES       
+#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES
 TYPE_FIND_REGISTER_START_WITH_DEFINE (vcd, "video/x-vcd", GST_RANK_PRIMARY,
     "dat", "\000\377\377\377\377\377\377\377\377\377\377\000", 12,
     GST_TYPE_FIND_MAXIMUM);
-#endif 
+#endif
 TYPE_FIND_REGISTER_START_WITH_DEFINE (imelody, "audio/x-imelody",
     GST_RANK_PRIMARY, "imy,ime,imelody", "BEGIN:IMELODY", 13,
     GST_TYPE_FIND_MAXIMUM);

diff --git a/gst/videoconvert/gstvideoconvert.h b/gst/videoconvert/gstvideoconvert.h
index e2600fd..a7f9343 100644 (file)
--- a/gst/videoconvert/gstvideoconvert.h
+++ b/gst/videoconvert/gstvideoconvert.h
@@ -52,9 +52,9 @@ struct _GstVideoConvert {
   GstVideoPrimariesMode primaries_mode;
   gdouble alpha_value;
   gint n_threads;
-#ifdef USE_TBM  
+#ifdef USE_TBM
   GstBufferPool *pool;
-#endif  
+#endif
 };
 
 GST_ELEMENT_REGISTER_DECLARE (videoconvert);

diff --git a/meson.build b/meson.build
index 1e0d283..4d5af8e 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -368,15 +368,30 @@ else
 endif
 
 # TIZEN_BUILD_OPTION
+core_conf.set('TIZEN_FEATURE_WAYLAND_ENHANCEMENT', true)
+core_conf.set('TIZEN_FEATURE_TYPEFIND_ENHANCEMENT', true)
+core_conf.set('TIZEN_FEATURE_AUDIODECODER_MODIFICATION', true)
+core_conf.set('TIZEN_FEATURE_DISABLE_MIME_TYPES', true)
+core_conf.set('TIZEN_FEATURE_VIDEO_MODIFICATION', true)
+core_conf.set('TIZEN_FEATURE_SUBPARSE_MODIFICATION', true)
+core_conf.set('TIZEN_FEATURE_SUBPARSE_DROP_OUT_OF_SEGMENT', true)
+core_conf.set('TIZEN_FEATURE_HLS_WEBVTT', true)
+core_conf.set('TIZEN_FEATURE_VOLUME_MODIFICATION', true)
+core_conf.set('TIZEN_FEATURE_FORCE_SW_DECODER', true)
+core_conf.set('TIZEN_FEATURE_U3_AVOID_DEADLOCK', true)
+core_conf.set('TIZEN_FEATURE_PLAYBIN3_MODIFICATION', true)
+core_conf.set('TIZEN_FEATURE_DISABLE_EOS_DROP', true)
 
 tbm_dep = dependency('libtbm', required : get_option('tbm'))
 if tbm_dep.found()
-  core_conf.set('USE_TBM', 1)
+  core_conf.set('USE_TBM', true)
 endif
 
 if get_option('tv-profile')
-  core_conf.set('TIZEN_TV_PROFILE', 1)
-  core_conf.set('TIZEN_FEATURE_TRUSTZONE', 1)
+  core_conf.set('TIZEN_TV_PROFILE', true)
+  core_conf.set('TIZEN_FEATURE_TRUSTZONE', true)
+else
+  core_conf.set('TIZEN_FEATURE_RESOURCE_MANAGER', true)
 endif
 
 # TIZEN_BUILD_OPTION end

diff --git a/packaging/gst-plugins-base.spec b/packaging/gst-plugins-base.spec
index 396f66c..7d48564 100644 (file)
--- a/packaging/gst-plugins-base.spec
+++ b/packaging/gst-plugins-base.spec
@@ -86,28 +86,11 @@ mkdir -p build
 # FIXME: GTKDOC_CFLAGS, GST_OBJ_CFLAGS:
 # Silently ignored compilation of uninstalled gtk-doc scanners without RPM_OPT_FLAGS.
 export CFLAGS="%{optflags} -fno-strict-aliasing\
- -DTIZEN_FEATURE_WAYLAND_ENHANCEMENT\
- -DTIZEN_FEATURE_TYPEFIND_ENHANCEMENT\
- -DTIZEN_FEATURE_AUDIODECODER_MODIFICATION\
- -DTIZEN_FEATURE_DISABLE_MIME_TYPES\
- -DTIZEN_FEATURE_VIDEO_MODIFICATION\
- -DTIZEN_FEATURE_SUBPARSE_MODIFICATION\
- -DTIZEN_FEATURE_SUBPARSE_DROP_OUT_OF_SEGMENT\
- -DTIZEN_FEATURE_HLS_WEBVTT\
- -DTIZEN_FEATURE_VOLUME_MODIFICATION\
- -DTIZEN_FEATURE_FORCE_SW_DECODER\
- -DTIZEN_FEATURE_U3_AVOID_DEADLOCK\
- -DTIZEN_FEATURE_PLAYBIN3_MODIFICATION\
- -DTIZEN_FEATURE_DISABLE_EOS_DROP\
-%if "%{tizen_profile_name}" != "tv"
- -DTIZEN_FEATURE_RESOURCE_MANAGER\
-%endif
- -DTIZEN_FEATURE_UPSTREAM\
  -fstack-protector-strong\
  -Wl,-z,relro\
  -D_FORTIFY_SOURCE=2\
  "
-meson --auto-feature=auto --prefix=/usr --libdir=%{_libdir} --datadir=%{_datadir} \
+meson --prefix=/usr --libdir=%{_libdir} --datadir=%{_datadir} \
     -D examples=disabled \
     -D tests=disabled \
     -D doc=disabled \