From bf097650e331de4ff6a8f417730e1087b00a5ff0 Mon Sep 17 00:00:00 2001 From: Eunhye Choi Date: Mon, 14 Feb 2022 20:04:18 +0900 Subject: [PATCH] spec: remove release macro - spec : remove release macro which is not supported on Quick Build system - core : disable deprecated declaration temporarily to avoid build error of related modules Change-Id: Ib527e9aaf98d3c4c0d933eca30b77e4f70af6416 --- packaging/gstreamer.spec | 37 +++------------------------------- subprojects/gstreamer/gst/gstelement.h | 5 +++++ subprojects/gstreamer/gst/meson.build | 1 + subprojects/gstreamer/meson.build | 1 + 4 files changed, 10 insertions(+), 34 deletions(-) diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec index 012ffe0..5f8a704 100644 --- a/packaging/gstreamer.spec +++ b/packaging/gstreamer.spec @@ -10,17 +10,6 @@ ## if not, all the source code in subprojects will be built ####################################################################### -## Release information for each plugin -%define _core_release 0 -%define _base_release 0 -%define _good_release 0 -%define _bad_release 0 -%define _ugly_release 0 -%define _libav_release 0 -%define _omx_release 0 -%define _rs_release 0 -%define _es_release 0 - %if 0%{?plugin:1} %if "%{plugin}" == "core" %define _name gstreamer @@ -48,7 +37,6 @@ %endif %define _source_path subprojects/%{_name} - %define _release %{_%{plugin}_release} %else @@ -67,13 +55,11 @@ %define _rs_opt gst-rtsp-server: %define _es_opt gst-editing-services: - %define _release %{_core_release} - %endif Name: %{_name} Version: 1.20.0 -Release: %{_release} +Release: 0 Summary: Streaming-Media Framework Runtime License: LGPL-2.0+ Group: Multimedia/Framework @@ -131,12 +117,10 @@ to develop applications that require these. %else -BuildRequires: gstreamer-devel >= %{version} -#BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(gstreamer-1.0) %if "%{plugin}" != "base" -BuildRequires: gst-plugins-base-devel >= %{version} -#BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) %endif %endif @@ -147,7 +131,6 @@ BuildRequires: gst-plugins-base-devel >= %{version} %if "%{plugin}" == "all" %package -n gst-plugins-base -Release: %{_base_release} Summary: GStreamer Streaming-Media Framework Plug-Ins Group: Multimedia/Framework %endif @@ -200,7 +183,6 @@ videos. Its plug-in-based architecture means that new data types or processing capabilities can be added simply by installing new plug-ins. %package -n gst-plugins-base-extension-adder -Release: %{_base_release} Summary: libgstadder.so for gst-plugins-base Requires: gst-plugins-base = %{version}-%{release} Provides: gst-plugins-base-profile_mobile = %{version}-%{release} @@ -210,7 +192,6 @@ Libgstadder.so for gst-plugin-base. Supplicant for gst-plugin-base. This is for Tizen mobile profile. %package -n gst-plugins-base-devel -Release: %{_base_release} Summary: Include files and Libraries Requires: gst-plugins-base = %{version} @@ -226,7 +207,6 @@ to compile and link applications that use gstreamer-plugins-base. %if "%{plugin}" == "all" %package -n gst-plugins-good -Release: %{_good_release} Summary: GStreamer Streaming-Media Framework Plug-Ins Group: Multimedia/Framework %endif @@ -271,7 +251,6 @@ videos. Its plug-in-based architecture means that new data types or processing capabilities can be added simply by installing new plug-ins. %package -n gst-plugins-good-extra -Release: %{_good_release} Summary: Complementary plugins for gst-plugins-good Group: Productivity/Multimedia/Other Requires: gst-plugins-good = %{version} @@ -289,7 +268,6 @@ plugins not included in official Tizen images, which may be used for development %if "%{plugin}" == "all" %package -n gst-plugins-bad -Release: %{_bad_release} Summary: GStreamer Streaming-Media Framework Plug-Ins Group: Multimedia/Framework %endif @@ -332,7 +310,6 @@ videos. Its plug-in-based architecture means that new data types or processing capabilities can be added simply by installing new plug-ins. %package -n gst-plugins-bad-devel -Release: %{_bad_release} Summary: GStreamer Streaming-Media Framework Plug-Ins Requires: gst-plugins-bad = %{version}-%{release} Requires: gst-plugins-base-devel @@ -352,7 +329,6 @@ processing capabilities can be added simply by installing new plug-ins. %if "%{plugin}" == "all" %package -n gst-plugins-ugly -Release: %{_ugly_release} Summary: GStreamer plugins from the "ugly" set Group: Multimedia/Framework %endif @@ -384,7 +360,6 @@ BuildRequires: pkgconfig(opencore-amrnb) %if "%{plugin}" == "all" %package -n gst-omx -Release: %{_omx_release} Summary: GStreamer plug-in that allows communication with OpenMAX IL components Group: Multimedia/Framework %endif @@ -412,7 +387,6 @@ Multiple OpenMAX IL implementations can be used. %if "%{plugin}" == "all" %package -n gst-libav -Release: %{_libav_release} Summary: Libav plugin for GStreamer Group: Multimedia/Framework %endif @@ -446,7 +420,6 @@ demuxing 30+ formats and colorspace conversion. %if "%{plugin}" == "all" %package -n gst-rtsp-server -Release: %{_rs_release} Summary: Multimedia Framework Library Group: System/Libraries %endif @@ -463,7 +436,6 @@ elements for decoding 90+ formats (AVI, MPEG, OGG, Matroska, ASF, ...), demuxing 30+ formats and colorspace conversion. %package -n gst-rtsp-server-devel -Release: %{_rs_release} Summary: Multimedia Framework RTSP server library (DEV) Group: Development/Libraries Requires: gst-rtsp-server = %{version}-%{release} @@ -478,7 +450,6 @@ Requires: gst-rtsp-server = %{version}-%{release} %if "%{plugin}" == "all" %package -n gst-editing-services -Release: %{_es_release} Summary: GStreamer Editing Service Plug-Ins Group: Multimedia/Framework %endif @@ -486,7 +457,6 @@ Group: Multimedia/Framework %if "%{plugin}" == "all" || "%{plugin}" == "es" BuildRequires: flex -BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: pkgconfig(libxml-2.0) Requires: gstreamer >= 1.0.0 @@ -497,7 +467,6 @@ This is a high-level library for facilitating the creation of audio/video non-linear editors. %package -n gst-editing-services-devel -Release: %{_es_release} Summary: Development files for gst-editing-services Requires: gst-editing-services = %{version}-%{release} diff --git a/subprojects/gstreamer/gst/gstelement.h b/subprojects/gstreamer/gst/gstelement.h index e690bf0..bbaaaf6 100644 --- a/subprojects/gstreamer/gst/gstelement.h +++ b/subprojects/gstreamer/gst/gstelement.h @@ -1038,8 +1038,13 @@ void gst_element_no_more_pads (GstElement *element); GST_API GstPad* gst_element_get_static_pad (GstElement *element, const gchar *name); +#ifdef TIZEN_FEATURE_DISABLE_DEPRECATED_DECLARATION +GST_API +GstPad* gst_element_get_request_pad (GstElement *element, const gchar *name); +#else GST_API G_DEPRECATED_FOR(gst_element_request_pad_simple) GstPad* gst_element_get_request_pad (GstElement *element, const gchar *name); +#endif GST_API GstPad* gst_element_request_pad_simple (GstElement *element, const gchar *name); diff --git a/subprojects/gstreamer/gst/meson.build b/subprojects/gstreamer/gst/meson.build index cd16dcc..3a932ba 100644 --- a/subprojects/gstreamer/gst/meson.build +++ b/subprojects/gstreamer/gst/meson.build @@ -257,6 +257,7 @@ pkgconfig.generate(libgst, variables : pkgconfig_variables, uninstalled_variables: pkgconfig_uninstalled_variables, subdirs : pkgconfig_subdirs, + extra_cflags : ['-DTIZEN_FEATURE_DISABLE_DEPRECATED_DECLARATION'], name : pkg_name, description : 'Streaming media framework', ) diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build index cd47c72..7b9b96d 100644 --- a/subprojects/gstreamer/meson.build +++ b/subprojects/gstreamer/meson.build @@ -580,6 +580,7 @@ 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) +cdata.set('TIZEN_FEATURE_DISABLE_DEPRECATED_DECLARATION', true) if get_option('tv-profile') cdata.set('TIZEN_PROFILE_TV', true) cdata.set('TIZEN_FEATURE_TRUSTZONE', true) -- 2.7.4