From 3948a2e2d03e9bbfa04eca204f9f3a4ea3485121 Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Wed, 31 Jan 2024 15:25:14 +0800 Subject: [PATCH] Delete unnecessary files (cherry picked from commit 510adbdfc8fc8c8e915fedd1d77e702f59d42523) --- backport-xclaesse:fix-meson-0-58.patch | 47 -------------------------- gstreamer1-plugins-base.spec | 5 ++- 2 files changed, 4 insertions(+), 48 deletions(-) delete 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 deleted file mode 100644 index f4decb2..0000000 --- a/backport-xclaesse:fix-meson-0-58.patch +++ /dev/null @@ -1,47 +0,0 @@ -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 6a05d52..571b9fd 100644 --- a/gstreamer1-plugins-base.spec +++ b/gstreamer1-plugins-base.spec @@ -3,7 +3,7 @@ Name: gstreamer1-plugins-base Version: 1.18.4 -Release: 3 +Release: 4 Summary: GStreamer streaming media framework base plugins License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ @@ -266,6 +266,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' %{_mandir}/man1/gst-device-monitor-*.gz %changelog +* Wed Jan 31 2024 liyanan - 1.18.4-4 +- Delete unnecessary files + * Tue Jan 11 2022 wuchaochao - 1.18.4-3 - change patch name -- Gitee