$ git diff --patch-with-stat --summary b3e09c25cdf40a7e2f7f1a4c45e12eb660bfd1f5..64f93e0ed7929a840e6bc9cb758933608959eae9

 gst-plugins-bad.spec | 164 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 91 insertions(+), 73 deletions(-)

diff --git a/gst-plugins-bad.spec b/gst-plugins-bad.spec
index 3fe11e8..ae7e31f 100644
--- a/gst-plugins-bad.spec
+++ b/gst-plugins-bad.spec
@@ -1,15 +1,4 @@
-#FIXME
-#For some reason as of 1.16.2 wayland package is not build. All needed Wayland br added but configure refuses to build W:
-#checking for wayland-scanner... /usr/bin/wayland-scanner
-#configure: *** checking feature: wayland sink ***
-#configure: *** for plug-ins: wayland  ***
-#checking for WAYLAND... no
-#configure: *** These plugins will not be built: wayland
-# angry
-
-%define build_experimental	0
 %define _disable_ld_no_undefined 1
-%{?_with_experimental: %{expand: %%global build_experimental 1}}
 %define build_amrwb	0
 %define build_faac	0
 %define build_faad	0
@@ -53,7 +42,7 @@
 %define libbadaudio		%mklibname gstbadaudio %{api} %{major}
 %define libisoff		%mklibname gstisoff %{api} %{major}
 %define libbadvideo		%mklibname gstbadvideo %{api} %{major}
-#define libgstwayland		%mklibname gstwayland %{api} %{major}
+%define libgstwayland		%mklibname gstwayland %{api} %{major}
 %define libgstplayer		%mklibname gstplayer %{api} %{major}
 %define libgstsctp		%mklibname gstsctp %{api} %{major}
 %define libgstopencv		%mklibname gstopencv %{api} %{major}
@@ -63,7 +52,7 @@
 Summary:	GStreamer Streaming-media framework plug-ins
 Name:		gst-plugins-bad
 Version:	1.16.2
-Release:	1%{?extrarelsuffix}
+Release:	2%{?extrarelsuffix}
 License:	LGPLv2+ and GPLv2+
 Group:		Sound
 Url:		http://gstreamer.freedesktop.org/
@@ -73,6 +62,8 @@ Source0:	http://gstreamer.freedesktop.org/src/gst-plugins-bad/%{name}-%{version}
 %ifarch %{ix86} %{x86_64}
 BuildRequires:	nasm => 0.90
 %endif
+BuildRequires:	meson
+BuildRequires:	cmake
 BuildRequires:	pkgconfig(bzip2)
 BuildRequires:	gettext-devel
 BuildRequires:	fonts-ttf-dejavu
@@ -80,6 +71,7 @@ BuildRequires:	gobject-introspection-devel
 BuildRequires:	kernel-release-headers
 BuildRequires:	ladspa-devel
 BuildRequires:	flite-devel
+BuildRequires:	pkgconfig(aom)
 BuildRequires:	pkgconfig(bluez)
 BuildRequires:	pkgconfig(libbs2b) >= 3.1.0
 BuildRequires:	pkgconfig(libxml-2.0) >= 2.9.2
@@ -88,6 +80,7 @@ BuildRequires:	pkgconfig(cairo)
 BuildRequires:	pkgconfig(pangocairo)
 BuildRequires:	pkgconfig(OpenEXR)
 BuildRequires:	pkgconfig(check)
+BuildRequires:	pkgconfig(libdrm)
 BuildRequires:	pkgconfig(dbus-1)
 BuildRequires:	pkgconfig(dvdnav) >= 4.1.2
 BuildRequires:	pkgconfig(dvdread) >= 4.1.2
@@ -96,7 +89,7 @@ BuildRequires:	pkgconfig(exempi-2.0)
 BuildRequires:	pkgconfig(fluidsynth)
 BuildRequires:	pkgconfig(gio-2.0) >= 2.25.0
 BuildRequires:	pkgconfig(gtk+-3.0)
-#BuildRequires:	pkgconfig(gl)
+BuildRequires:	pkgconfig(gl)
 BuildRequires:	pkgconfig(glu)
 BuildRequires:	pkgconfig(glesv2)
 BuildRequires:	pkgconfig(glib-2.0)
@@ -128,8 +121,11 @@ BuildRequires:	pkgconfig(openal)
 BuildRequires:	pkgconfig(opencv)
 BuildRequires:	pkgconfig(opus)
 BuildRequires:	pkgconfig(orc-0.4) >= 0.4.5
+BuildRequires:	pkgconfig(openh264)
 BuildRequires:	pkgconfig(librsvg-2.0) >= 2.36
 BuildRequires:	pkgconfig(librtmp)
+BuildRequires:	pkgconfig(lrdf)
+BuildRequires:	pkgconfig(raptor2)
 BuildRequires:	pkgconfig(sbc) >= 1.0
 BuildRequires:	pkgconfig(sdl)
 BuildRequires:	pkgconfig(lilv-0)
@@ -140,16 +136,17 @@ BuildRequires:	pkgconfig(libusb-1.0)
 BuildRequires:	pkgconfig(vdpau)
 BuildRequires:	pkgconfig(wayland-client)
 BuildRequires:	pkgconfig(wayland-egl)
-BuildRequires:  pkgconfig(wayland-scanner)
+BuildRequires:	pkgconfig(wayland-scanner)
 BuildRequires:	pkgconfig(x11)
 BuildRequires:	pkgconfig(zvbi-0.2)
 BuildRequires:	pkgconfig(libva-drm)
 BuildRequires:	pkgconfig(libssh2)
-BuildRequires:	libmpcdec-devel
 BuildRequires:	pkgconfig(valgrind)
 BuildRequires:	pkgconfig(libpcap)
 BuildRequires:	pkgconfig(libtiff-4)
 BuildRequires:	pkgconfig(lcms2)
+BuildRequires:	pkgconfig(nice)
+BuildRequires:	pkgconfig(webrtc-audio-processing)
 %if %{build_plf}
 BuildRequires:	pkgconfig(vo-aacenc)
 BuildRequires:	pkgconfig(vo-amrwbenc)
@@ -166,7 +163,7 @@ BuildRequires:	pkgconfig(Qt5X11Extras)
 BuildRequires:	pkgconfig(Qt5WaylandClient)
 # vulkan support
 BuildRequires:	%{_lib}vulkan-devel
-BuildRequires:  egl-devel
+BuildRequires:	egl-devel
 %rename gstreamer1.0-plugins-bad
 
 %description
@@ -222,8 +219,8 @@ This package is in restricted repository as it violates some patents.
 %endif
 
 %package -n %{libadaptivedemux}
-Summary:        Libraries for GStreamer streaming-media framework
-Group:          System/Libraries
+Summary:	Libraries for GStreamer streaming-media framework
+Group:		System/Libraries
 
 %description -n %{libadaptivedemux}
 This package contains the libraries for %{name}%{api}.
@@ -250,59 +247,59 @@ Group:		System/Libraries
 This package contains the libraries for %{name}%{api}.
 
 %package -n %{libbadaudio}
-Summary:        Libraries for GStreamer streaming-media framework
-Group:          System/Libraries
+Summary:	Libraries for GStreamer streaming-media framework
+Group:		System/Libraries
 
 %description -n %{libbadaudio}
 This package contains the libraries for %{name}%{api}.
 
 %package -n %{libwebrtc}
-Summary:        Libraries for GStreamer streaming-media framework
-Group:          System/Libraries
+Summary:	Libraries for GStreamer streaming-media framework
+Group:		System/Libraries
 
 %description -n %{libwebrtc}
 This package contains the libraries for %{name}%{api}.
 
 %package -n %{libbadvideo}
-Summary:        Libraries for GStreamer streaming-media framework
-Group:          System/Libraries
+Summary:	Libraries for GStreamer streaming-media framework
+Group:		System/Libraries
 
 %description -n %{libbadvideo}
 This package contains the libraries for %{name}%{api}.
 
-#package -n %{libgstwayland}
-#Summary:        Libraries for GStreamer streaming-media framework
-#Group:          System/Libraries
+%package -n %{libgstwayland}
+Summary:	Libraries for GStreamer streaming-media framework
+Group:		System/Libraries
 
-#description -n %{libgstwayland}
-#This package contains the libraries for %{name}%{api}.
+%description -n %{libgstwayland}
+This package contains the libraries for %{name}%{api}.
 
 %package -n %{libgstplayer}
-Summary:        Libraries for GStreamer streaming-media framework
-Group:          System/Libraries
+Summary:	Libraries for GStreamer streaming-media framework
+Group:		System/Libraries
 
 %description -n %{libgstplayer}
 This package contains the libraries for %{name}%{api}.
 
 %package -n %{libgstsctp}
-Summary:        SCTP library for GStreamer streaming-media framework
-Group:          System/Libraries
+Summary:	SCTP library for GStreamer streaming-media framework
+Group:		System/Libraries
 
 %description -n %{libgstsctp}
 This package contains the SCTP library for %{name}%{api}.
 
 %package -n %{libgstopencv}
-Summary:        Libraries for GStreamer OpenCV framework
-Group:          System/Libraries
+Summary:	Libraries for GStreamer OpenCV framework
+Group:		System/Libraries
 
 %description -n %{libgstopencv}
 This package contains the libraries for %{name}%{api}.
 
-#%package -n %{libgl}
+#package -n %{libgl}
 #Summary:	Libraries for GStreamer streaming-media framework
 #Group:		System/Libraries
 
-#%description -n %{libgl}
+#description -n %{libgl}
 #GStreamer is a streaming-media framework, based on graphs of filters which
 #operate on media data. Applications using this library can do anything
 #from real-time sound processing to playing videos, and just about anything
@@ -349,7 +346,7 @@ Requires:	%{libphotography} = %{version}-%{release}
 Requires:	%{libcodecparsers} = %{version}-%{release}
 Requires:	%{libinsertbin} = %{version}-%{release}
 Requires:	%{libisoff} = %{version}-%{release}
-#Requires:	%{libgstwayland} = %{version}-%{release}
+Requires:	%{libgstwayland} = %{version}-%{release}
 Requires:	%{libbadaudio} = %{version}-%{release}
 Requires:	%{libgstplayer} = %{version}-%{release}
 Requires:	%{libgstsctp} = %{EVRD}
@@ -533,6 +530,14 @@ Plug-ins for encoding AAC audio
 This package is in restricted repository as it violates some patents.
 %endif
 
+%package -n %{bname}-wayland
+Summary:	GStreamer plugin for Wayland support
+Group:		Sound
+Requires:	%{bname}-plugins-base
+
+%description -n %{bname}-wayland
+GStreamer plugin for Wayland support
+
 %package -n %{bname}-gsm
 Summary:	GStreamer plugin for GSM lossy audio format
 Group:		Sound
@@ -581,47 +586,57 @@ GObject Introspection interface description for %{name}.
 %autosetup -p1
 
 %build
-export CC=%{__cc}
-export CXX=%{__cxx}
-export HAVE_CXX="yes"
+# (tpg) fix finding libmpcdec
+sed -i -e 's#mpc/mpcdec.h#mpcdec/mpcdec.h#g' $(grep -ril 'mpc/mpcdec.h' *)
+
 export CFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-header-guard -Wno-deprecated-register"
-export CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags -Wno-header-guard -Wno-deprecated-register"
-%configure \
-	--disable-static \
-	--disable-directfb \
-	--with-package-name='OpenMandriva %{name} package' \
-	--with-package-origin='http://www.openmandriva.org/' \
-	--with-gtk=3.0 \
+export CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags -Wno-header-guard -Wno-deprecated-register -std=gnu++17 -Wno-dynamic-exception-spec -Wno-register"
+%meson \
+	-Ddirectfb=disabled \
+	-Dpackage-name='OpenMandriva %{name} %{version}-%{release}' \
+	-Dpackage-origin='%{disturl}' \
 %if ! %{build_faac}
-	--disable-faac \
+	-Dfaac=disabled \
+	-Dfdkaac=disabled \
 %endif
 %if ! %{build_faad}
-	--disable-faad \
-%endif
-%if ! %{build_xvid}
-	--disable-xvid \
+	-Dfaad=disabled \
 %endif
 %if ! %{build_dts}
-	--disable-dts \
+	-Ddts=disabled \
 %endif
 %if ! %{build_plf}
-	--disable-voamrwbenc \
-	--disable-voaacenc \
-%endif
-	--enable-wayland \
-%if %{build_experimental}
-	--enable-experimental
+	-Dvoaacenc=disabled \
+	-Dvoamrwbenc=disabled \
+	-Dlibde265=disabled \
+	-Dx265=disabled \
 %endif
-
-%make_build CXXFLAGS+="-std=gnu++14"
+	-Dwayland=enabled \
+	-Dmsdk=disabled \
+	-Dopensles=disabled \
+	-Dtinyalsa=disabled \
+	-Dwasapi=disabled \
+	-Dnvdec=disabled \
+	-Dnvenc=disabled \
+	-Diqa=disabled \
+	-Dmusepack=disabled \
+	-Dopenmpt=disabled \
+	-Dopenni2=disabled \
+	-Dsctp=disabled \
+	-Dsrt=disabled \
+	-Dwpe=disabled \
+	-Dzbar=disabled
+
+%meson_build
 
 %install
-%make_install
+%meson_install
 
 %find_lang %{name}-%{api}
 
 %files -n %{bname}-plugins-bad -f %{name}-%{api}.lang
 %doc AUTHORS COPYING README NEWS
+%{_bindir}/playout
 %{_libdir}/gstreamer-%{api}/libgstadpcmdec.so
 %{_libdir}/gstreamer-%{api}/libgstadpcmenc.so
 %{_libdir}/gstreamer-%{api}/libgstasfmux.so
@@ -671,7 +686,6 @@ export CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags -Wno-header-guard -Wno-deprecate
 %{_libdir}/gstreamer-%{api}/libgstopenjpeg.so
 %{_libdir}/gstreamer-%{api}/libgstpcapparse.so
 %{_libdir}/gstreamer-%{api}/libgstpnm.so
-#%{_libdir}/gstreamer-%{api}/libgstqmlgl.so
 %{_libdir}/gstreamer-%{api}/libgstremovesilence.so
 %{_libdir}/gstreamer-%{api}/libgstresindvd.so
 %{_libdir}/gstreamer-%{api}/libgstrsvg.so
@@ -699,9 +713,6 @@ export CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags -Wno-header-guard -Wno-deprecate
 %{_libdir}/gstreamer-%{api}/libgstvoamrwbenc.so
 %{_datadir}/gstreamer-%{api}/presets/GstVoAmrwbEnc.prs
 %endif
-%if %{build_experimental}
-#%{_libdir}/gstreamer-%{api}/libgstdeinterlace2.so
-%endif
 %{_libdir}/gstreamer-%{api}/libgstmodplug.so
 %{_libdir}/gstreamer-%{api}/libgsty4mdec.so
 %{_libdir}/gstreamer-%{api}/libgstaccurip.so
@@ -741,6 +752,15 @@ export CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags -Wno-header-guard -Wno-deprecate
 %{_libdir}/gstreamer-%{api}/libgstproxy.so
 %{_libdir}/gstreamer-%{api}/libgstcolormanagement.so
 %{_libdir}/gstreamer-%{api}/libgstvulkan.so
+%{_libdir}/gstreamer-1.0/libgstaom.so
+%{_libdir}/gstreamer-1.0/libgstkms.so
+%{_libdir}/gstreamer-1.0/libgstopenh264.so
+%{_libdir}/gstreamer-1.0/libgstwebrtc.so
+%{_libdir}/gstreamer-1.0/libgstwebrtcdsp.so
+
+%files -n %{bname}-wayland
+%{_libdir}/gstreamer-1.0/libgstwaylandsink.so
+
 %if %{build_faad}
 %files -n %{bname}-faad
 %{_libdir}/gstreamer-%{api}/libgstfaad.so
@@ -796,8 +816,8 @@ export CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags -Wno-header-guard -Wno-deprecate
 %files -n %{libwebrtc}
 %{_libdir}/libgstwebrtc-%{api}.so.%{major}*
 
-#files -n %{libgstwayland}
-#{_libdir}/libgstwayland-%{api}.so.%{major}*
+%files -n %{libgstwayland}
+%{_libdir}/libgstwayland-%{api}.so.%{major}*
 
 %files -n %{libgstplayer}
 %{_libdir}/libgstplayer-%{api}.so.%{major}*
@@ -808,14 +828,12 @@ export CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags -Wno-header-guard -Wno-deprecate
 %files -n %{libgstopencv}
 %{_libdir}/libgstopencv-%{api}.so.%{major}*
 %{_libdir}/gstreamer-1.0/libgstopencv.so
-%{_datadir}/gst-plugins-bad/%{api}/opencv_haarcascades/*.xml
 
 #%files -n %{libgstwebrtc}
 #%{_libdir}/libgstbadallocators-%{api}.so.%{major}*
 
 %files -n %{devname}
 %doc docs/plugins/html
-%doc %{_datadir}/gtk-doc/html/
 %{_libdir}/libgstadaptivedemux-%{api}.so
 %{_libdir}/libgstbasecamerabinsrc-%{api}.so
 %{_libdir}/libgstcodecparsers-%{api}.so
@@ -825,7 +843,7 @@ export CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags -Wno-header-guard -Wno-deprecate
 %{_libdir}/libgsturidownloader-%{api}.so
 %{_libdir}/libgstbadaudio-%{api}.so
 %{_libdir}/libgstwebrtc-%{api}.so
-#{_libdir}/libgstwayland-%{api}.so
+%{_libdir}/libgstwayland-%{api}.so
 %{_libdir}/libgstplayer-%{api}.so
 %{_libdir}/libgstopencv-%{api}.so
 %{_libdir}/libgstsctp-%{api}.so