Move the defines from spec to meson.build

Change-Id: Ic7483b9b364186652edb075b6681a6992185bde2

diff --git a/meson.build b/meson.build
index 5695fe7..36789a8 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -569,8 +569,20 @@ if dlog_dep.found()
   cdata.set('TIZEN_DLOG', 1)
 endif
 
+cdata.set('TIZEN_FEATURE_QUEUE2_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_FILESINK_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_MQ_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_MQ_MODIFICATION_EXTRA_SIZE_TIME', true)
+cdata.set('TIZEN_FEATURE_MQ_SKIP_BUFFERING', true)
+cdata.set('TIZEN_FEATURE_BASEPARSE_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_QUEUE_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_FAKESINK_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_INPUT_SELECTOR_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_SEEK_THRESHOLD', true)
+cdata.set('TIZEN_FEATURE_RTSPSRC_MODIFICATION', true)
 if get_option('tv-profile')
-  cdata.set('TIZEN_TV_PROFILE', 1)
+  cdata.set('TIZEN_TV_PROFILE', true)
+  cdata.set('TIZEN_FEATURE_TRUSTZONE', true)
 endif
 
 # TIZEN BUILD OPTION end

diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec
index 2fe94c8..8d4c559 100644 (file)
--- a/packaging/gstreamer.spec
+++ b/packaging/gstreamer.spec
@@ -63,28 +63,12 @@ cp %{SOURCE1001} .
 
 %build
 export CFLAGS="%{optflags} \
-       -DTIZEN_FEATURE_QUEUE2_MODIFICATION\
-       -DTIZEN_FEATURE_FILESINK_MODIFICATION\
-       -DTIZEN_FEATURE_MQ_MODIFICATION\
-       -DTIZEN_FEATURE_MQ_MODIFICATION_EXTRA_SIZE_TIME\
-       -DTIZEN_FEATURE_MQ_SKIP_BUFFERING\
-       -DTIZEN_FEATURE_BASEPARSE_MODIFICATION\
-       -DTIZEN_FEATURE_QUEUE_MODIFICATION\
-       -DTIZEN_FEATURE_FAKESINK_MODIFICATION\
-       -DTIZEN_FEATURE_INPUT_SELECTOR_MODIFICATION\
-       -DTIZEN_FEATURE_UPSTREAM\
-       -DTIZEN_FEATURE_SEEK_THRESHOLD\
-%if "%{tizen_profile_name}" == "tv"
-       -DTIZEN_PROFILE_TV\
-       -DTIZEN_FEATURE_TRUSTZONE\
-%endif
-       -DTIZEN_FEATURE_RTSPSRC_MODIFICATION\
        -fno-strict-aliasing\
        -fstack-protector-strong\
        -Wl,-z,relro\
        -D_FORTIFY_SOURCE=2"
 
-%meson --auto-feature=auto \
+meson --prefix=/usr --libdir=%{_libdir} --datadir=%{_datadir} \
   -D bash-completion=disabled \
   -D check=disabled \
   -D examples=disabled \
@@ -93,12 +77,15 @@ export CFLAGS="%{optflags} \
 %if "%{tizen_profile_name}" == "tv"
   -D tv-profile=true \
 %endif
-  -D ptp-helper-permissions=none
+  -D ptp-helper-permissions=none \
+  build
 
-%meson_build
+ninja -C build all %{?_smp_mflags}
 
 %install
-%meson_install
+rm -rf %{buildroot}
+export DESTDIR=%{buildroot}
+ninja -C build install
 mkdir -p %{buildroot}%{_datadir}/gstreamer-%{gst_branch}/presets
 mkdir -p %{buildroot}%{_docdir}/%{name}
 %find_lang %{name}-%{gst_branch}