!6 gstreamer1-plugins-base

Merge pull request !6 from shirely/master

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 <gst/foo/foo-prelude.h>
+ 
+-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

gstreamer1-plugins-base.spec

@@ -3,18 +3,19 @@
 
 Name:            gstreamer1-plugins-base
 Version:         1.16.2
-Release:         1
+Release:         2
 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
+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 egl-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
@@ -47,6 +48,7 @@ This package provides manual for developpers.
 %prep
 %setup -q -n gst-plugins-base-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 NOCONFIGURE=1 \
@@ -268,6 +270,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_mandir}/man1/gst-device-monitor-*.gz
 
 %changelog
+* Wed Aug 05 2020 hanhui <hanhui15@huawei.com> - 1.16.2-2
+-change the mesa-libELGS-devel to libglvnd-devel AND fix make error
+
 * Sat Jul 25 2020 hanhui <hanhui15@huawei.com> - 1.16.2-1
 - update 1.16.2