Move the defines from spec to meson.build

Change-Id: Icd30589c3f5318806b4f3708abc75ee0398b3a94

diff --git a/meson.build b/meson.build
index 2e5acde..e99bec1 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -418,6 +418,23 @@ endif
 
 gio_dep = dependency('gio-2.0')
 
+cdata.set('TIZEN_FEATURE_V4L2SRC_AUTO_SCAN_DEVICE_NODE', true)
+cdata.set('TIZEN_FEATURE_V4L2SRC_SUPPORT_CAMERA_ID', true)
+cdata.set('TIZEN_FEATURE_V4L2VIDEO_ADJ_RANK', true)
+cdata.set('TIZEN_FEATURE_WAVPARSE_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_MP3PARSE_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_AACPARSE_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_QTDEMUX_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_QTDEMUX_DURATION', true)
+cdata.set('TIZEN_FEATURE_FLVDEMUX_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_RTSP_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_SOUP_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_RGVOLUME_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_DISABLE_V4L2_DEPENDENCY', true)
+cdata.set('TIZEN_FEATURE_AVIDEMUX_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_USE_LIBV4L2', true)
+cdata.set('TIZEN_FEATURE_V4L2_ADDITIONAL_CID_SUPPORT', true)
+
 # TIZEN_BUILD_OPTION end
 
 # Disable compiler warnings for unused variables and args if gst debug system is disabled

diff --git a/packaging/gst-plugins-good.spec b/packaging/gst-plugins-good.spec
index a77f0a1..0261dca 100644 (file)
--- a/packaging/gst-plugins-good.spec
+++ b/packaging/gst-plugins-good.spec
@@ -74,30 +74,13 @@ cp %{SOURCE1001} .
 %build
 mkdir -p build
 export CFLAGS+=" \
-       -DTIZEN_FEATURE_V4L2SRC_AUTO_SCAN_DEVICE_NODE\
-       -DTIZEN_FEATURE_V4L2SRC_SUPPORT_CAMERA_ID\
-       -DTIZEN_FEATURE_V4L2VIDEO_ADJ_RANK\
-       -DTIZEN_FEATURE_WAVPARSE_MODIFICATION\
-       -DTIZEN_FEATURE_MP3PARSE_MODIFICATION\
-       -DTIZEN_FEATURE_AACPARSE_MODIFICATION\
-       -DTIZEN_FEATURE_QTDEMUX_MODIFICATION\
-       -DTIZEN_FEATURE_QTDEMUX_DURATION\
-       -DTIZEN_FEATURE_FLVDEMUX_MODIFICATION\
-       -DTIZEN_FEATURE_RTSP_MODIFICATION\
-       -DTIZEN_FEATURE_SOUP_MODIFICATION\
-       -DTIZEN_FEATURE_RGVOLUME_MODIFICATION\
-       -DTIZEN_FEATURE_DISABLE_V4L2_DEPENDENCY\
-       -DTIZEN_FEATURE_AVIDEMUX_MODIFICATION\
-       -DTIZEN_FEATURE_USE_LIBV4L2\
-       -DTIZEN_FEATURE_V4L2_ADDITIONAL_CID_SUPPORT\
-       -D__TIZEN__\
        -fstack-protector-strong\
        -Wl,-z,relro\
        -Wno-error\
        -D_FORTIFY_SOURCE=2"
 export CXXFLAGS+=" -Wno-error"
 
-meson --auto-feature=auto --prefix=/usr --libdir=%{_libdir} --datadir=%{_datadir} \
+meson --prefix=/usr --libdir=%{_libdir} --datadir=%{_datadir} \
 %if ! 0%{?ENABLE_AALIB}
     -D aalib=disabled \
 %endif