From ecb2cb52fe3d747d83c31bfd4eb50a0c9c444802 Mon Sep 17 00:00:00 2001 From: 18302918689 <1360148247@qq.com> Date: Wed, 5 Aug 2020 14:54:28 +0800 Subject: [PATCH 1/2] change the mesa-libELGS-devel to libglvnd-devel --- gstreamer1-plugins-base.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gstreamer1-plugins-base.spec b/gstreamer1-plugins-base.spec index 2e96488..8d7f66e 100644 --- a/gstreamer1-plugins-base.spec +++ b/gstreamer1-plugins-base.spec @@ -3,7 +3,7 @@ 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/ @@ -14,7 +14,7 @@ Patch0: 0001-missing-plugins-Remove-the-mpegaudioversion-field.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 @@ -268,6 +268,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' %{_mandir}/man1/gst-device-monitor-*.gz %changelog +* Wed Aug 05 2020 hanhui - 1.16.2-2 +-change the mesa-libELGS-devel to libglvnd-devel + * Sat Jul 25 2020 hanhui - 1.16.2-1 - update 1.16.2 -- Gitee From 3e57f3bdbc43506940dc89836ed3e4b22c38d46e Mon Sep 17 00:00:00 2001 From: 18302918689 <1360148247@qq.com> Date: Wed, 5 Aug 2020 15:32:43 +0800 Subject: [PATCH 2/2] fix build err --- Adapt-to-backwards-incompatible-change-in-GUN.patch | 13 +++++++++++++ gstreamer1-plugins-base.spec | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 Adapt-to-backwards-incompatible-change-in-GUN.patch 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 0000000..376c17f --- /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/gstreamer1-plugins-base.spec b/gstreamer1-plugins-base.spec index 8d7f66e..93ef08b 100644 --- a/gstreamer1-plugins-base.spec +++ b/gstreamer1-plugins-base.spec @@ -10,6 +10,7 @@ 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 @@ -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 \ @@ -269,7 +271,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' %changelog * Wed Aug 05 2020 hanhui - 1.16.2-2 --change the mesa-libELGS-devel to libglvnd-devel +-change the mesa-libELGS-devel to libglvnd-devel AND fix make error * Sat Jul 25 2020 hanhui - 1.16.2-1 - update 1.16.2 -- Gitee