diff --git a/backport-xclaesse-fix-meson-0-58.patch b/backport-xclaesse-fix-meson-0-58.patch deleted file mode 100644 index f4decb2d18c94a6cb396094df1b23b0c838c8cba..0000000000000000000000000000000000000000 --- 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/gst-plugins-base-1.18.4.tar.xz b/gst-plugins-base-1.20.3.tar.xz similarity index 30% rename from gst-plugins-base-1.18.4.tar.xz rename to gst-plugins-base-1.20.3.tar.xz index 5a145f9654885d266ad76711f16da4bc23c9afd0..0639dc7144b74a879f2c2beefa6dd08881c12aa3 100644 Binary files a/gst-plugins-base-1.18.4.tar.xz and b/gst-plugins-base-1.20.3.tar.xz differ diff --git a/gstreamer1-plugins-base.spec b/gstreamer1-plugins-base.spec index 6f62e023742a9a9036b5249a54600bf42bc543d6..f79ac98b6b7bd8b4756784e7a1088c0b7e7e67eb 100644 --- a/gstreamer1-plugins-base.spec +++ b/gstreamer1-plugins-base.spec @@ -2,14 +2,13 @@ %global gst_mm gstreamer-%{majorminor} Name: gstreamer1-plugins-base -Version: 1.18.4 -Release: 3 +Version: 1.20.3 +Release: 1 Summary: GStreamer streaming media framework base plugins License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.xz 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 @@ -31,6 +30,7 @@ GStreamer is a graphics library for built-in media processing components. BasePl %package devel Summary: GStreamer Base Plugins Development files Requires: %{name} = %{version}-%{release} +Requires: gstreamer1-devel>= %{version}-%{release} Provides: tools %description devel @@ -48,7 +48,6 @@ This package provides manual for developpers. %prep %setup -q -n gst-plugins-base-%{version} %patch0 -p1 -%patch6000 -p1 %build %meson -D doc=disabled -D orc=enabled \ @@ -93,8 +92,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/gstreamer-base.appdata.xml < - 1.20.3-1 +- update to 1.20.3 + * Mon Jun 20 2022 lin zhang - 1.18.4-3 - remove meson option gtk_doc