From 4709c0feca24bc7b513c5a68fe0b8378072b5ed8 Mon Sep 17 00:00:00 2001 From: 19909236985 Date: Mon, 10 Jan 2022 16:58:00 +0800 Subject: [PATCH] 1 --- backport-xclaesse:fix-meson-0-58.patch | 47 ++++++++++++++++++++++++++ gstreamer1-plugins-base.spec | 8 ++++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 backport-xclaesse:fix-meson-0-58.patch diff --git a/backport-xclaesse:fix-meson-0-58.patch b/backport-xclaesse:fix-meson-0-58.patch new file mode 100644 index 0000000..f4decb2 --- /dev/null +++ b/backport-xclaesse:fix-meson-0-58.patch @@ -0,0 +1,47 @@ +From 90903917a8185e0f9add7af8153ae2fc9875fdcb Mon Sep 17 00:00:00 2001 +From: Xavier Claessens +Date: Mon, 26 Apr 2021 14:25:03 -0400 +Subject: [PATCH] gstgl: Fix build when Meson >= 0.58.0rc1 + +"implicit_include_directories: false" now also means that current build +directory is not added to include paths by default any more. We have to +add it manually because we have some custom_target() that generate +headers in current build directory. + +See https://github.com/mesonbuild/meson/issues/8700. + +Part-of: +--- + gst-libs/gst/gl/meson.build | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build +index db11c5e89..731ee9f5e 100644 +--- a/gst-libs/gst/gl/meson.build ++++ b/gst-libs/gst/gl/meson.build +@@ -989,11 +989,20 @@ if build_gstgl + command : [mkenums, glib_mkenums, '@OUTPUT@', '@INPUT@']) + gen_sources = [gl_enumtypes_h] + ++ common_args = gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'] ++ ++ # We have custom_target() that generate headers in the current build dir, ++ # but with implicit_include_directories: false, meson >= 0.58.0 won't include ++ # it by default. We cannot use include_directories('.') here because it would ++ # also include current source dir which is what we want to avoid because ++ # case-insensitive FS would include gst-libs/gl/egl/egl.h as EGL/egl.h. ++ common_args += '-I@0@'.format(meson.current_build_dir()) ++ + gstgl = library('gstgl-' + api_version, + gl_sources, gl_egl_sources, gl_x11_sources, gl_wayland_sources, gl_priv_sources, gl_enumtypes_c, gl_enumtypes_h, +- c_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'], +- cpp_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'], +- objc_args : gst_plugins_base_args + gl_cpp_args + gl_objc_args + ['-DBUILDING_GST_GL'], ++ c_args : common_args, ++ cpp_args : common_args, ++ objc_args : common_args + gl_objc_args, + include_directories : [configinc, libsinc, gl_includes], + version : libversion, + soversion : soversion, +-- +GitLab diff --git a/gstreamer1-plugins-base.spec b/gstreamer1-plugins-base.spec index aece221..06769d0 100644 --- a/gstreamer1-plugins-base.spec +++ b/gstreamer1-plugins-base.spec @@ -3,7 +3,7 @@ Name: gstreamer1-plugins-base Version: 1.18.4 -Release: 1 +Release: 2 Summary: GStreamer streaming media framework base plugins License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ @@ -11,6 +11,8 @@ Source0: http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugi Patch0: 0001-missing-plugins-Remove-the-mpegaudioversion-field.patch +Patch6000: backport-xclaesse:fix-meson-0-58.patch + BuildRequires: gcc-c++ gstreamer1-devel >= %{version} gobject-introspection-devel >= 1.31.1 iso-codes-devel alsa-lib-devel BuildRequires: cdparanoia-devel libogg-devel >= 1.0 libtheora-devel >= 1.1 libvisual-devel libvorbis-devel >= 1.0 libXv-devel BuildRequires: orc-devel >= 0.4.18 pango-devel pkgconfig opus-devel gdk-pixbuf2-devel gtk3-devel gtk-doc >= 1.3 libxslt @@ -48,6 +50,7 @@ This package provides manual for developpers. %prep %setup -q -n gst-plugins-base-%{version} %patch0 -p1 +%patch6000 -p1 %build %meson -D doc=disabled -D gtk_doc=disabled -D orc=enabled \ @@ -263,6 +266,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' %{_mandir}/man1/gst-device-monitor-*.gz %changelog +* Mon Jan 10 2022 wuchaochao - 1.18.4-2 +- fix build when Meson >= 0.58.0 + * Wed Jun 23 2021 weijin deng - 1.18.4-1 - Upgrade to 1.18.4 - Delete Adapt-to-backwards-incompatible-change-in-GUN.patch whose target -- Gitee