diff --git a/Adapt-to-backwards-incompatible-change-in-GUN.patch b/Adapt-to-backwards-incompatible-change-in-GUN.patch new file mode 100644 index 0000000000000000000000000000000000000000..376c17fe442f79d59716bfc6dd102434fa5b5780 --- /dev/null +++ b/Adapt-to-backwards-incompatible-change-in-GUN.patch @@ -0,0 +1,13 @@ +diff -Nuar gstreamer-1.16.2/common/gst-glib-gen.mak b/common/gst-glib-gen.mak +--- gstreamer-1.16.2/common/gst-glib-gen.mak 2019-04-19 17:16:18.000000000 +0800 ++++ b/common/gst-glib-gen.mak 2020-08-04 15:27:22.980652961 +0800 +@@ -8,7 +8,8 @@ + #glib_gen_decl_banner=GST_EXPORT + #glib_gen_decl_include=\#include + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++hash:=\# ++enum_headers=$(foreach h,$(glib_enum_headers),\n$(hash)include \"$(h)\") + + # these are all the rules generating the relevant files + $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list diff --git a/CVE-2019-9928.patch b/CVE-2019-9928.patch deleted file mode 100644 index 01126b61b078af4e381339bb9af3ecd5e204a5d7..0000000000000000000000000000000000000000 --- a/CVE-2019-9928.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gst-libs/gst/rtsp/gstrtspconnection.c 2012-02-17 09:49:52.000000000 -0500 -+++ b/gst-libs/gst/rtsp/gstrtspconnection_1.c 2019-05-07 07:54:18.894000000 -0400 -@@ -2007,7 +2007,7 @@ build_next (GstRTSPBuilder * builder, Gs - maxlen = sizeof (conn->session_id) - 1; - /* the sessionid can have attributes marked with ; - * Make sure we strip them */ -- for (i = 0; session_id[i] != '\0'; i++) { -+ for (i = 0; i < maxlen && session_id[i] != '\0'; i++) { - if (session_id[i] == ';') { - maxlen = i; - /* parse timeout */ diff --git a/gst-plugins-base-1.14.4.tar.xz b/gst-plugins-base-1.16.2.tar.xz similarity index 33% rename from gst-plugins-base-1.14.4.tar.xz rename to gst-plugins-base-1.16.2.tar.xz index 9642f71f278dc09b5ceea5866d0bf7f9e5bfed6a..4673d50553b17cd23e72f6904f199e3a37a206a4 100644 Binary files a/gst-plugins-base-1.14.4.tar.xz and b/gst-plugins-base-1.16.2.tar.xz differ diff --git a/gstreamer1-plugins-base.spec b/gstreamer1-plugins-base.spec index 6b09b1dcbc0167ef391475252bb561dfce543fe7..7938f37ba231431231f785b8f502eae8fed4e71d 100644 --- a/gstreamer1-plugins-base.spec +++ b/gstreamer1-plugins-base.spec @@ -2,20 +2,24 @@ %global gst_mm gstreamer-%{majorminor} Name: gstreamer1-plugins-base -Version: 1.14.4 -Release: 3 +Version: 1.16.2 +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: CVE-2019-9928.patch +Patch1: Adapt-to-backwards-incompatible-change-in-GUN.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 gtk-doc >= 1.3 libxslt gdb -BuildRequires: automake gettext-devel libtool chrpath mesa-libGL-devel mesa-libGLES-devel mesa-libGLU-devel mesa-libEGL-devel wayland-devel +BuildRequires: automake gettext-devel libtool chrpath mesa-libGL-devel libglvnd-devel mesa-libGLU-devel mesa-libEGL-devel wayland-devel egl-wayland-devel +BuildRequires: pkgconfig(wayland-client) >= 1.0 +BuildRequires: pkgconfig(wayland-cursor) >= 1.0 +BuildRequires: pkgconfig(wayland-egl) >= 9.0 +BuildRequires: pkgconfig(wayland-protocols) >= 1.15 Requires: iso-codes @@ -28,7 +32,6 @@ GStreamer is a graphics library for built-in media processing components. BasePl Summary: GStreamer Base Plugins Development files Requires: %{name} = %{version}-%{release} Provides: tools -Obsoletes: tools %description devel This package contains static libraries and header files. @@ -38,7 +41,6 @@ Summary: Developer documentation for GStreamer Base plugins library Requires: %{name} = %{version}-%{release} BuildArch: noarch Provides: devel-docs -Obsoletes: devel-docs %description help This package provides manual for developpers. @@ -46,7 +48,7 @@ This package provides manual for developpers. %prep %setup -q -n gst-plugins-base-%{version} %patch0 -p1 -%patch6000 -p1 +%patch1 -p1 %build NOCONFIGURE=1 \ @@ -133,6 +135,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' %{_includedir}/%{gst_mm}/gst/audio/audio-quantize.h %{_includedir}/%{gst_mm}/gst/audio/audio-resampler.h %{_includedir}/%{gst_mm}/gst/audio/audio.h +%{_includedir}/%{gst_mm}/gst/audio/audio-buffer.h %{_includedir}/%{gst_mm}/gst/audio/audio-prelude.h %{_includedir}/%{gst_mm}/gst/audio/gstaudioaggregator.h %{_includedir}/%{gst_mm}/gst/audio/gstaudiobasesink.h @@ -188,6 +191,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' %{_includedir}/%{gst_mm}/gst/rtp/gstrtp-enumtypes.h %{_includedir}/%{gst_mm}/gst/rtp/gstrtphdrext.h %{_includedir}/%{gst_mm}/gst/rtp/gstrtppayloads.h +%{_includedir}/%{gst_mm}/gst/rtp/gstrtpmeta.h %{_includedir}/%{gst_mm}/gst/rtp/rtp.h %{_includedir}/%{gst_mm}/gst/rtp/rtp-prelude.h %dir %{_includedir}/%{gst_mm}/gst/rtsp @@ -227,8 +231,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' %{_includedir}/%{gst_mm}/gst/video/gstvideosink.h %{_includedir}/%{gst_mm}/gst/video/gstvideotimecode.h %{_includedir}/%{gst_mm}/gst/video/gstvideoutils.h +%{_includedir}/%{gst_mm}/gst/video/gstvideoaggregator.h %{_includedir}/%{gst_mm}/gst/video/navigation.h %{_includedir}/%{gst_mm}/gst/video/video-blend.h +%{_includedir}/%{gst_mm}/gst/video/video-anc.h %{_includedir}/%{gst_mm}/gst/video/video-overlay-composition.h %{_includedir}/%{gst_mm}/gst/video/video-chroma.h %{_includedir}/%{gst_mm}/gst/video/video-color.h @@ -264,6 +270,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' %{_mandir}/man1/gst-device-monitor-*.gz %changelog +* Tue Aug 18 2020 zhanzhimin - 1.16.2-1 +- update to 1.16.2 + * Fri Mar 20 2020 openEuler Buildteam - 1.14.4-3 - add gdb in buildrequires