diff --git a/Adapt-to-backwards-incompatible-change-in-GUN.patch b/Adapt-to-backwards-incompatible-change-in-GUN.patch
deleted file mode 100644
index 376c17fe442f79d59716bfc6dd102434fa5b5780..0000000000000000000000000000000000000000
--- a/Adapt-to-backwards-incompatible-change-in-GUN.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
diff --git a/gst-plugins-base-1.16.2.tar.xz b/gst-plugins-base-1.16.2.tar.xz
deleted file mode 100644
index 4673d50553b17cd23e72f6904f199e3a37a206a4..0000000000000000000000000000000000000000
Binary files a/gst-plugins-base-1.16.2.tar.xz and /dev/null differ
diff --git a/gst-plugins-base-1.18.4.tar.xz b/gst-plugins-base-1.18.4.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..5a145f9654885d266ad76711f16da4bc23c9afd0
Binary files /dev/null and b/gst-plugins-base-1.18.4.tar.xz differ
diff --git a/gstreamer1-plugins-base.spec b/gstreamer1-plugins-base.spec
index 93ef08b84760797ed87280feb6855036f4f4f689..aece2213981eb6c71f867a00218cc6a53d47c08e 100644
--- a/gstreamer1-plugins-base.spec
+++ b/gstreamer1-plugins-base.spec
@@ -2,24 +2,24 @@
 %global         gst_mm          gstreamer-%{majorminor}
 
 Name:            gstreamer1-plugins-base
-Version:         1.16.2
-Release:         2
+Version:         1.18.4
+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
-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 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
+BuildRequires:  orc-devel >= 0.4.18 pango-devel pkgconfig opus-devel gdk-pixbuf2-devel gtk3-devel gtk-doc >= 1.3 libxslt
+BuildRequires:  libjpeg-turbo-devel gcc meson >= 0.48.0 gettext-devel chrpath mesa-libGLES-devel graphene-devel
+BuildRequires:  mesa-libGL-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
 
@@ -48,20 +48,14 @@ This package provides manual for developpers.
 %prep
 %setup -q -n gst-plugins-base-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
-NOCONFIGURE=1 \
-./autogen.sh
-
-%configure \
-  --with-package-name='GStreamer-plugins-base package' --enable-experimental \
-  --disable-fatal-warnings --disable-silent-rules --enable-gtk-doc --enable-orc
-
-%make_build V=1
+%meson -D doc=disabled -D gtk_doc=disabled -D orc=enabled \
+	-D tremor=disabled -D tests=disabled -D examples=disabled
+%meson_build
 
 %install
-%make_install
+%meson_install
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
 cat > $RPM_BUILD_ROOT%{_datadir}/appdata/gstreamer-base.appdata.xml <<EOF
@@ -254,6 +248,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_includedir}/%{gst_mm}/gst/video/videodirection.h
 %{_includedir}/%{gst_mm}/gst/video/videoorientation.h
 %{_includedir}/%{gst_mm}/gst/video/videooverlay.h
+%{_includedir}/%{gst_mm}/gst/video/video-hdr.h
 
 %dir %{_datadir}/gst-plugins-base/%{majorminor}/
 %{_datadir}/gst-plugins-base/%{majorminor}/license-translations.dict
@@ -263,13 +258,17 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 
 %files help
 %doc AUTHORS README REQUIREMENTS
-%doc %{_datadir}/gtk-doc/html/gst-plugins-base-libs-%{majorminor}
-%doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
 %{_mandir}/man1/gst-discoverer-*.gz
 %{_mandir}/man1/gst-play-*.gz
 %{_mandir}/man1/gst-device-monitor-*.gz
 
 %changelog
+* Wed Jun 23 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 1.18.4-1
+- Upgrade to 1.18.4
+- Delete Adapt-to-backwards-incompatible-change-in-GUN.patch whose target
+  patch file doesn't exist in this version 1.18.4
+- Use meson rebuild
+
 * Wed Aug 05 2020 hanhui <hanhui15@huawei.com> - 1.16.2-2
 -change the mesa-libELGS-devel to libglvnd-devel AND fix make error