From b39a88a73729a0580af66bce0c114adee5ed22f5 Mon Sep 17 00:00:00 2001 From: Gilbok Lee Date: Thu, 17 Mar 2022 09:35:28 +0900 Subject: [PATCH] Fix build error in tv profile - Add the necessary cflags in pkgconfig - Add missed build define [Version] 1.20.0-10 [Issue Type] Bug fix Change-Id: Id86be2511a21c711e55ca2636d12625871b24d4a --- packaging/gstreamer.spec | 2 +- .../gst-plugins-bad/gst-libs/gst/meson.build | 18 ++++++++++-------- subprojects/gst-plugins-bad/meson.build | 9 +++++++++ .../gst-libs/gst/video/meson.build | 7 ++++++- subprojects/gst-plugins-base/meson.build | 3 +++ subprojects/gst-plugins-good/meson.build | 9 +++++++++ subprojects/gst-plugins-good/meson_options.txt | 2 ++ subprojects/gst-plugins-ugly/meson.build | 14 +++++--------- subprojects/gstreamer/gst/gstquery.h | 2 +- .../gstreamer/libs/gst/base/meson.build | 8 ++++++++ 10 files changed, 54 insertions(+), 20 deletions(-) diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec index 9d9e7b9b18..4c02214e89 100644 --- a/packaging/gstreamer.spec +++ b/packaging/gstreamer.spec @@ -59,7 +59,7 @@ Name: %{_name} Version: 1.20.0 -Release: 9 +Release: 10 Summary: Streaming-Media Framework Runtime License: LGPL-2.0+ Group: Multimedia/Framework diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/meson.build index 77dadcf09c..8d0f4160e0 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/meson.build +++ b/subprojects/gst-plugins-bad/gst-libs/gst/meson.build @@ -1,22 +1,24 @@ -subdir('uridownloader') +subdir('codecparsers') +subdir('mpegts') +subdir('codecs') +subdir('sctp') +subdir('transcoder') +subdir('wayland') +subdir('webrtc') +if not (get_option('tv-profile')) +subdir('uridownloader') subdir('adaptivedemux') subdir('audio') subdir('basecamerabinsrc') -subdir('codecparsers') -subdir('codecs') subdir('d3d11') subdir('insertbin') subdir('interfaces') subdir('isoff') -subdir('mpegts') subdir('opencv') subdir('play') subdir('player') -subdir('sctp') -subdir('transcoder') subdir('va') subdir('vulkan') -subdir('wayland') -subdir('webrtc') subdir('winrt') +endif diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build index 3b72173caf..1fb32df847 100644 --- a/subprojects/gst-plugins-bad/meson.build +++ b/subprojects/gst-plugins-bad/meson.build @@ -455,6 +455,15 @@ cdata.set('TIZEN_FEATURE_HLSDEMUX_DISCONT', true) cdata.set('TIZEN_FEATURE_WEBRTC_MODIFICATION', true) cdata.set('TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM', true) cdata.set('TIZEN_FEATURE_PITCH_AUDIO_META', true) +if get_option('tv-profile') + cdata.set('TIZEN_PROFILE_TV', true) + cdata.set('TIZEN_FEATURE_TRUSTZONE', true) +endif + +# TIZEN_GLOBAL_BUILD_OPTION +cdata.set('TIZEN_FEATURE_BASEPARSE_MODIFICATION', true) +cdata.set('TIZEN_FEATURE_WAYLAND_ENHANCEMENT', true) +cdata.set('USE_TBM', true) # For plugins from libnice libnice_dep = dependency('nice', version : '>=0.1.17', required : get_option('nice')) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/video/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/video/meson.build index 1389b2ba4d..b4eecef4f2 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/video/meson.build +++ b/subprojects/gst-plugins-base/gst-libs/gst/video/meson.build @@ -147,13 +147,18 @@ gstvideo = library('gstvideo-@0@'.format(api_version), dependencies : gstvideo_deps, ) +extra_defs = ['-DTIZEN_FEATURE_WAYLAND_ENHANCEMENT'] +if get_option('tv-profile') + extra_defs += ['-DTIZEN_PROFILE_TV'] +endif + library_def = {'lib': gstvideo} pkg_name = 'gstreamer-video-1.0' pkgconfig.generate(gstvideo, libraries : [gst_dep, gst_base_dep], variables : pkgconfig_variables, subdirs : pkgconfig_subdirs, - extra_cflags : ['-DTIZEN_FEATURE_WAYLAND_ENHANCEMENT'], + extra_cflags : extra_defs, name : pkg_name, description : 'Video base classes and helper functions', ) diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build index b3536475e5..fe9bb0f1b1 100644 --- a/subprojects/gst-plugins-base/meson.build +++ b/subprojects/gst-plugins-base/meson.build @@ -402,6 +402,9 @@ else core_conf.set('TIZEN_FEATURE_RESOURCE_MANAGER', true) endif +# TIZEN_GLOBAL_BUILD_OPTION +core_conf.set('TIZEN_FEATURE_BASEPARSE_MODIFICATION', true) + # TIZEN_BUILD_OPTION end # Used to build SSE* things in audio-resampler diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build index 8f748f3d46..2458c6eb64 100644 --- a/subprojects/gst-plugins-good/meson.build +++ b/subprojects/gst-plugins-good/meson.build @@ -451,6 +451,15 @@ cdata.set('TIZEN_FEATURE_V4L2_SKIP_ADD_COLORSPACE', true) cdata.set('TIZEN_FEATURE_GST_MUX_ENHANCEMENT', true) cdata.set('TIZEN_FEATURE_V4L2_DISABLE_COLORIMETRY', true) +if get_option('tv-profile') + cdata.set('TIZEN_PROFILE_TV', true) + cdata.set('TIZEN_FEATURE_TRUSTZONE', true) +endif + +# TIZEN_GLOBAL_BUILD_OPTION +cdata.set('TIZEN_FEATURE_BASEPARSE_MODIFICATION', true) +cdata.set('TIZEN_FEATURE_WAYLAND_ENHANCEMENT', true) + gio_dep = dependency('gio-2.0') # TIZEN_BUILD_OPTION end diff --git a/subprojects/gst-plugins-good/meson_options.txt b/subprojects/gst-plugins-good/meson_options.txt index eb1e9458a8..3c9e6db055 100644 --- a/subprojects/gst-plugins-good/meson_options.txt +++ b/subprojects/gst-plugins-good/meson_options.txt @@ -115,3 +115,5 @@ option('doc', type : 'feature', value : 'auto', yield: true, # Tizen Options option('tbm', type : 'boolean', value : true, description : 'tizen buffer manager') +option('tv-profile', type : 'boolean', value : false, + description : 'tv-profile') diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build index a98be6acaa..864deae0cd 100644 --- a/subprojects/gst-plugins-ugly/meson.build +++ b/subprojects/gst-plugins-ugly/meson.build @@ -182,6 +182,11 @@ endif cdata.set('TIZEN_FEATURE_ASFDEMUX_CHECK_DATA_SIZE', true) cdata.set('TIZEN_FEATURE_ASFDEMUX_DISABLE_UNSUPPORTED_FORMAT', true) cdata.set('TIZEN_FEATURE_ASFDEMUX_POST_TAG_MSG', true) + +if get_option('tv-profile') + cdata.set('TIZEN_PROFILE_TV', true) + cdata.set('TIZEN_FEATURE_TRUSTZONE', true) +endif # TIZEN_BUILD_OPTION end ugly_args = ['-DHAVE_CONFIG_H'] @@ -197,15 +202,6 @@ else gst_debug_disabled = cc.has_header_symbol('gst/gstconfig.h', 'GST_DISABLE_GST_DEBUG', dependencies: gst_dep) endif -# TIZEN_OPTION - -if get_option('tv-profile') - core_conf.set('TIZEN_PROFILE_TV', true) - core_conf.set('TIZEN_FEATURE_TRUSTZONE', true) -endif - -# TIZEN_OPTION end - if gst_debug_disabled message('GStreamer debug system is disabled') if cc.has_argument('-Wno-unused') diff --git a/subprojects/gstreamer/gst/gstquery.h b/subprojects/gstreamer/gst/gstquery.h index 5d5460b66d..03409e72cf 100644 --- a/subprojects/gstreamer/gst/gstquery.h +++ b/subprojects/gstreamer/gst/gstquery.h @@ -127,7 +127,7 @@ typedef enum { GST_QUERY_CONTEXT = GST_QUERY_MAKE_TYPE (190, _FLAG(BOTH)), GST_QUERY_BITRATE = GST_QUERY_MAKE_TYPE (200, _FLAG(DOWNSTREAM)), #ifdef TIZEN_PROFILE_TV - GST_QUERY_RESOURCE = GST_QUERY_MAKE_TYPE (210, FLAG (BOTH)), /*< skip >*/ + GST_QUERY_RESOURCE = GST_QUERY_MAKE_TYPE (210, _FLAG (BOTH)), /*< skip >*/ #endif } GstQueryType; #undef _FLAG diff --git a/subprojects/gstreamer/libs/gst/base/meson.build b/subprojects/gstreamer/libs/gst/base/meson.build index 04ebd5228e..52eb688aad 100644 --- a/subprojects/gstreamer/libs/gst/base/meson.build +++ b/subprojects/gstreamer/libs/gst/base/meson.build @@ -1,3 +1,5 @@ +extra_defs = [] + gst_base_sources = files( 'gstadapter.c', 'gstaggregator.c', @@ -49,6 +51,11 @@ gst_base = library('gstbase-@0@'.format(apiversion), dependencies : [gobject_dep, glib_dep, gst_dep], ) +extra_defs += ['-DTIZEN_FEATURE_BASEPARSE_MODIFICATION'] +if get_option('tv-profile') + extra_defs += ['-DTIZEN_PROFILE_TV', '-DTIZEN_FEATURE_TRUSTZONE'] +endif + library_def = {'lib': gst_base} pkg_name = 'gstreamer-base-1.0' gst_base_gen_sources = [] @@ -56,6 +63,7 @@ pkgconfig.generate(gst_base, libraries : [libgst], variables : pkgconfig_variables, subdirs : pkgconfig_subdirs, + extra_cflags : extra_defs, name : pkg_name, description : 'Base classes for GStreamer elements', ) -- 2.34.1