diff --git a/gst-p-bad-cleanup.sh b/gst-p-bad-cleanup.sh
index c340116..2f8d8b7 100755
--- a/gst-p-bad-cleanup.sh
+++ b/gst-p-bad-cleanup.sh
@@ -41,6 +41,7 @@ dataurisrc
 dccp
 debugutils
 dtmf
+dvbsubenc
 faceoverlay
 festival
 fieldanalysis
@@ -84,6 +85,8 @@ proxy
 qtmux
 rawparse
 removesilence
+rist
+rtmp2
 rtp
 rtpmux
 rtpvp8
@@ -96,7 +99,9 @@ smooth
 speed
 stereo
 subenc
+switchbin
 timecode
+transcode
 tta
 valve
 videofilters
@@ -164,20 +169,6 @@ for subdir in gst ext sys; do
 			echo "**** Removing $MODULE ****"
 			echo "Removing directory $dir"
 			rm -r $dir || error "Cannot remove $dir"
-			if grep -q "AG_GST_CHECK_PLUGIN($MODULE)" configure.ac ; then
-				echo "Removing element check for $MODULE"
-				grep -v "AG_GST_CHECK_PLUGIN($MODULE)" configure.ac > configure.ac.new && mv configure.ac.new configure.ac
-			fi
-			echo "Removing Makefile generation for $MODULE"
-			grep -v "$dir/Makefile" configure.ac > configure.ac.new && mv configure.ac.new configure.ac
-			# Urgh
-			if test $MODULE = real ; then
-				grep -v "AG_GST_DISABLE_PLUGIN(real)" configure.ac > configure.ac.new && mv configure.ac.new configure.ac
-			fi
-			echo "Removing documentation for $MODULE"
-			if grep -q "$MODULE" docs/plugins/Makefile.am ; then
-				grep -v $dir docs/plugins/Makefile.am > docs/plugins/Makefile.am.new && mv docs/plugins/Makefile.am.new docs/plugins/Makefile.am
-			fi
 			echo
 		elif test $subdir = ext  || test $subdir = sys; then
 			# Ignore library or system non-blacklisted plugins
@@ -197,10 +188,6 @@ if test "x$unknown" != "x"; then
   exit 1
 fi
 
-#autoreconf
-NOCONFIGURE=1 \
-./autogen.sh
-
 popd > /dev/null
 
 tar cJf $NEW_SOURCE $DIRECTORY
diff --git a/gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch b/gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch
deleted file mode 100644
index 817b842..0000000
--- a/gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urNp gst-plugins-bad-1.16.2.orig/common/gst-glib-gen.mak gst-plugins-bad-1.16.2/common/gst-glib-gen.mak
---- gst-plugins-bad-1.16.2.orig/common/gst-glib-gen.mak	2020-03-20 14:57:08.587740695 +0100
-+++ gst-plugins-bad-1.16.2/common/gst-glib-gen.mak	2020-03-20 15:00:42.584798988 +0100
-@@ -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/gstreamer1-plugins-bad-free.spec b/gstreamer1-plugins-bad-free.spec
index 2f925f1..8e37aa3 100644
--- a/gstreamer1-plugins-bad-free.spec
+++ b/gstreamer1-plugins-bad-free.spec
@@ -13,8 +13,8 @@
 #global shortcommit %(c=%{gitcommit}; echo ${c:0:5})
 
 Name:           gstreamer1-plugins-bad-free
-Version:        1.16.2
-Release:        4%{?gitcommit:.git%{shortcommit}}%{?dist}
+Version:        1.17.1
+Release:        1%{?gitcommit:.git%{shortcommit}}%{?dist}
 Summary:        GStreamer streaming media framework "bad" plugins
 
 License:        LGPLv2+ and LGPLv2
@@ -31,14 +31,6 @@ URL:            http://gstreamer.freedesktop.org/
 Source0:        gst-plugins-bad-free-%{version}.tar.xz
 Source1:        gst-p-bad-cleanup.sh
 
-# https://gitlab.freedesktop.org/gstreamer/common/-/merge_requests/4
-# https://bugzilla.redhat.com/show_bug.cgi?id=1799497
-Patch0:         gstreamer1-plugins-bad-build-adapt-to-backwards-incompatible-change.patch
-
-# https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1125
-# https://bugzilla.redhat.com/show_bug.cgi?id=1799497
-Patch1:         gstreamer1-plugins-bad-lv2-make-it-build-with-fno-common.patch
-
 BuildRequires:  gstreamer1-devel >= %{version}
 BuildRequires:  gstreamer1-plugins-base-devel >= %{version}
 
@@ -47,7 +39,6 @@ BuildRequires:  automake
 BuildRequires:  check
 BuildRequires:  gettext-devel
 BuildRequires:  libXt-devel
-BuildRequires:  gtk-doc
 BuildRequires:  gobject-introspection-devel >= %{_gobject_introspection}
 
 BuildRequires:  bzip2-devel
@@ -89,6 +80,12 @@ BuildRequires:  mesa-libEGL-devel
 #BuildRequires:  vulkan-devel
 #BuildRequires:  mesa-vulkan-devel
 BuildRequires:  webrtc-audio-processing-devel
+BuildRequires:  libaom-devel
+BuildRequires:  libmicrodns-devel
+BuildRequires:  libopenmpt-devel
+BuildRequires:  srt-devel
+BuildRequires:  wpewebkit-devel
+BuildRequires:  wpebackend-fdo-devel
 
 %if %{with extras}
 BuildRequires:  libbs2b-devel >= 3.1.0
@@ -200,28 +197,32 @@ aren't tested well enough, or the code is not of good enough quality.
 
 %prep
 %setup -q -n gst-plugins-bad-%{version}
-%patch0 -p1
-%patch1 -p1
 
 
 %build
-autoreconf --force --install
-%configure --disable-silent-rules --disable-fatal-warnings \
-    --with-package-name="Fedora GStreamer-plugins-bad package" \
-    --with-package-origin="http://download.fedoraproject.org" \
-    %{!?with_extras:--disable-fbdev --disable-decklink --disable-linsys} \
-    --enable-debug --disable-static --enable-gtk-doc --enable-experimental \
-    --disable-dts --disable-faac --disable-faad \
-    --disable-libmms --disable-mpeg2enc --disable-mplex \
-    --disable-neon --disable-rtmp \
-    --disable-flite --disable-sbc --disable-opencv \
-    %{!?with_extras:--disable-spandsp} \
-    --disable-voamrwbenc --disable-x265
+%meson \
+    -D package-name="Fedora GStreamer-plugins-bad package" \
+    -D package-origin="http://download.fedoraproject.org" \
+    %{!?with_extras:-D fbdev=disabled -D decklink=disabled } \
+    -D doc=disabled -D magicleap=disabled -D msdk=disabled \
+    -D dts=disabled -D faac=disabled -D faad=disabled \
+    -D libmms=disabled -D mpeg2enc=disabled -D mplex=disabled \
+    -D neon=disabled -D rtmp=disabled -D rtmp2=disabled \
+    -D flite=disabled -D sbc=disabled -D opencv=disabled \
+    %{!?with_extras:-D spandsp=disabled} \
+    -D voamrwbenc=disabled -D x265=disabled \
+    -D dvbsuboverlay=disabled -D dvdspu=disabled -D siren=disabled \
+    -D real=disabled -D opensles=disabled -D tinyalsa=disabled \
+    -D wasapi=disabled -D wasapi2=disabled -D avtp=disabled \
+    -D dc1394=disabled -D directfb=disabled -D iqa=disabled \
+    -D libde265=disabled -D musepack=disabled -D openni2=disabled \
+    -D sctp=disabled -D svthevcenc=disabled -D voaacenc=disabled \
+    -D zxing=disabled
 
-%make_build
+%meson_build
 
 %install
-%make_install
+%meson_install
 
 # Register as an AppStream component to be visible in the software center
 #
@@ -276,8 +277,7 @@ EOF
 %find_lang gst-plugins-bad-%{majorminor}
 
 # unpackaged files
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
-
+rm $RPM_BUILD_ROOT%{_bindir}/playout
 
 %ldconfig_scriptlets
 
@@ -286,10 +286,21 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %doc AUTHORS README REQUIREMENTS
 
 %{_metainfodir}/*.appdata.xml
+%{_bindir}/gst-transcoder-%{majorminor}
 
 # presets
 %dir %{_datadir}/gstreamer-%{majorminor}/presets/
 %{_datadir}/gstreamer-%{majorminor}/presets/GstFreeverb.prs
+%{_datadir}/gstreamer-%{majorminor}/encoding-profiles/device/dvd.gep
+%{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/avi.gep
+%{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/flv.gep
+%{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/mkv.gep
+%{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/mp3.gep
+%{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/mp4.gep
+%{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/oga.gep
+%{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/ogv.gep
+%{_datadir}/gstreamer-%{majorminor}/encoding-profiles/file-extension/webm.gep
+%{_datadir}/gstreamer-%{majorminor}/encoding-profiles/online-services/youtube.gep
 
 # opencv data
 #{_datadir}/gst-plugins-bad/%{majorminor}/opencv_haarcascades/
@@ -298,21 +309,28 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_libdir}/libgstbasecamerabinsrc-%{majorminor}.so.*
 %{_libdir}/libgstbadaudio-%{majorminor}.so.*
 %{_libdir}/libgstcodecparsers-%{majorminor}.so.*
+%{_libdir}/libgstcodecs-%{majorminor}.so.*
 %{_libdir}/libgstinsertbin-%{majorminor}.so.*
 %{_libdir}/libgstisoff-%{majorminor}.so.*
 %{_libdir}/libgstmpegts-%{majorminor}.so.*
 %{_libdir}/libgstplayer-%{majorminor}.so.*
 %{_libdir}/libgstphotography-%{majorminor}.so.*
 %{_libdir}/libgstsctp-%{majorminor}.so.*
+%{_libdir}/libgsttranscoder-%{majorminor}.so.*
 %{_libdir}/libgsturidownloader-%{majorminor}.so.*
+%{_libdir}/libgstvulkan-%{majorminor}.so.*
 %{_libdir}/libgstwebrtc-%{majorminor}.so.*
 %if 0%{?fedora} || 0%{?rhel} > 7
 %{_libdir}/libgstwayland-%{majorminor}.so.*
 %endif
 
+%{_libdir}/girepository-1.0/GstBadAudio-1.0.typelib
+%{_libdir}/girepository-1.0/GstCodecs-1.0.typelib
 %{_libdir}/girepository-1.0/GstInsertBin-1.0.typelib
 %{_libdir}/girepository-1.0/GstMpegts-1.0.typelib
 %{_libdir}/girepository-1.0/GstPlayer-1.0.typelib
+%{_libdir}/girepository-1.0/GstTranscoder-1.0.typelib
+%{_libdir}/girepository-1.0/GstVulkan-1.0.typelib
 %{_libdir}/girepository-1.0/GstWebRTC-1.0.typelib
 
 # Plugins without external dependencies
@@ -330,7 +348,8 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_libdir}/gstreamer-%{majorminor}/libgstbayer.so
 %{_libdir}/gstreamer-%{majorminor}/libgstcamerabin.so
 %{_libdir}/gstreamer-%{majorminor}/libgstcoloreffects.so
-%{_libdir}/gstreamer-%{majorminor}/libgstdashdemux.so
+%{_libdir}/gstreamer-%{majorminor}/libgstdash.so
+%{_libdir}/gstreamer-%{majorminor}/libgstdvbsubenc.so
 %{_libdir}/gstreamer-%{majorminor}/libgstfaceoverlay.so
 %if %{with extras}
 %{_libdir}/gstreamer-%{majorminor}/libgstfbdevsink.so
@@ -369,6 +388,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_libdir}/gstreamer-%{majorminor}/libgstresindvd.so
 %{_libdir}/gstreamer-%{majorminor}/libgstrfbsrc.so
 %{_libdir}/gstreamer-%{majorminor}/libgstrsvg.so
+%{_libdir}/gstreamer-%{majorminor}/libgstrtpmanagerbad.so
 %{_libdir}/gstreamer-%{majorminor}/libgstrtponvif.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsdpelem.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsegmentclip.so
@@ -377,20 +397,24 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_libdir}/gstreamer-%{majorminor}/libgstsmoothstreaming.so
 %{_libdir}/gstreamer-%{majorminor}/libgstspeed.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsubenc.so
+%{_libdir}/gstreamer-%{majorminor}/libgstswitchbin.so
 %{_libdir}/gstreamer-%{majorminor}/libgsttimecode.so
+%{_libdir}/gstreamer-%{majorminor}/libgsttranscode.so
 %{_libdir}/gstreamer-%{majorminor}/libgstuvch264.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvideofiltersbad.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvideoframe_audiolevel.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvideoparsersbad.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvideosignal.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvmnc.so
-%{_libdir}/gstreamer-%{majorminor}/libgstyadif.so
 %{_libdir}/gstreamer-%{majorminor}/libgsty4mdec.so
 
 # System (Linux) specific plugins
 %{_libdir}/gstreamer-%{majorminor}/libgstdvb.so
+%{_libdir}/gstreamer-%{majorminor}/libgstv4l2codecs.so
 
 # Plugins with external dependencies
+
+%{_libdir}/gstreamer-%{majorminor}/libgstaom.so
 %{_libdir}/gstreamer-%{majorminor}/libgstbluez.so
 %{_libdir}/gstreamer-%{majorminor}/libgstbz2.so
 %{_libdir}/gstreamer-%{majorminor}/libgstclosedcaption.so
@@ -401,18 +425,25 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_libdir}/gstreamer-%{majorminor}/libgstkms.so
 %{_libdir}/gstreamer-%{majorminor}/libgstladspa.so
 %{_libdir}/gstreamer-%{majorminor}/libgstlv2.so
+%{_libdir}/gstreamer-%{majorminor}/libgstmicrodns.so
+%{_libdir}/gstreamer-%{majorminor}/libgstnvcodec.so
+%{_libdir}/gstreamer-%{majorminor}/libgstopenh264.so
+%{_libdir}/gstreamer-%{majorminor}/libgstopenmpt.so
 %{_libdir}/gstreamer-%{majorminor}/libgstopusparse.so
+%{_libdir}/gstreamer-%{majorminor}/libgstrist.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsndfile.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsoundtouch.so
+%{_libdir}/gstreamer-%{majorminor}/libgstsrt.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsrtp.so
 %{_libdir}/gstreamer-%{majorminor}/libgstttmlsubs.so
-#{_libdir}/gstreamer-%{majorminor}/libgstvulkan.so
+%{_libdir}/gstreamer-%{majorminor}/libgstvulkan.so
 %if 0%{?fedora} || 0%{?rhel} > 7
 %{_libdir}/gstreamer-%{majorminor}/libgstwaylandsink.so
 %endif
 %{_libdir}/gstreamer-%{majorminor}/libgstwebp.so
 %{_libdir}/gstreamer-%{majorminor}/libgstwebrtc.so
 %{_libdir}/gstreamer-%{majorminor}/libgstwebrtcdsp.so
+%{_libdir}/gstreamer-%{majorminor}/libgstwpe.so
 
 #debugging plugin
 %{_libdir}/gstreamer-%{majorminor}/libgstdebugutilsbad.so
@@ -436,7 +467,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_libdir}/gstreamer-%{majorminor}/libgstopenjpeg.so
 %{_libdir}/gstreamer-%{majorminor}/libgstspandsp.so
 %{_libdir}/gstreamer-%{majorminor}/libgstteletext.so
-%{_libdir}/gstreamer-%{majorminor}/libgstvdpau.so
 %{_libdir}/gstreamer-%{majorminor}/libgstzbar.so
 
 
@@ -449,27 +479,35 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_libdir}/gstreamer-%{majorminor}/libgstwildmidi.so
 %endif
 
-
 %files devel
+%if 0
 %doc %{_datadir}/gtk-doc/html/gst-plugins-bad-plugins-%{majorminor}
 %doc %{_datadir}/gtk-doc/html/gst-plugins-bad-libs-%{majorminor}
+%endif
 
+%{_datadir}/gir-1.0/GstBadAudio-%{majorminor}.gir
+%{_datadir}/gir-1.0/GstCodecs-%{majorminor}.gir
 %{_datadir}/gir-1.0/GstInsertBin-%{majorminor}.gir
 %{_datadir}/gir-1.0/GstMpegts-%{majorminor}.gir
 %{_datadir}/gir-1.0/GstPlayer-%{majorminor}.gir
+%{_datadir}/gir-1.0/GstTranscoder-%{majorminor}.gir
+%{_datadir}/gir-1.0/GstVulkan-%{majorminor}.gir
 %{_datadir}/gir-1.0/GstWebRTC-%{majorminor}.gir
 
 %{_libdir}/libgstadaptivedemux-%{majorminor}.so
 %{_libdir}/libgstbasecamerabinsrc-%{majorminor}.so
 %{_libdir}/libgstbadaudio-%{majorminor}.so
 %{_libdir}/libgstcodecparsers-%{majorminor}.so
+%{_libdir}/libgstcodecs-%{majorminor}.so
 %{_libdir}/libgstinsertbin-%{majorminor}.so
 %{_libdir}/libgstisoff-%{majorminor}.so
 %{_libdir}/libgstmpegts-%{majorminor}.so
 %{_libdir}/libgstplayer-%{majorminor}.so
 %{_libdir}/libgstphotography-%{majorminor}.so
 %{_libdir}/libgstsctp-%{majorminor}.so
+%{_libdir}/libgsttranscoder-%{majorminor}.so
 %{_libdir}/libgsturidownloader-%{majorminor}.so
+%{_libdir}/libgstvulkan-%{majorminor}.so
 %{_libdir}/libgstwebrtc-%{majorminor}.so
 %if 0%{?fedora} || 0%{?rhel} > 7
 %{_libdir}/libgstwayland-%{majorminor}.so
@@ -484,7 +522,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_includedir}/gstreamer-%{majorminor}/gst/mpegts
 %{_includedir}/gstreamer-%{majorminor}/gst/player
 %{_includedir}/gstreamer-%{majorminor}/gst/sctp
+%{_includedir}/gstreamer-%{majorminor}/gst/transcoder
 %{_includedir}/gstreamer-%{majorminor}/gst/uridownloader
+%{_includedir}/gstreamer-%{majorminor}/gst/vulkan/
 %{_includedir}/gstreamer-%{majorminor}/gst/webrtc/
 
 # pkg-config files
@@ -495,10 +535,15 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_libdir}/pkgconfig/gstreamer-player-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-plugins-bad-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-sctp-%{majorminor}.pc
+%{_libdir}/pkgconfig/gstreamer-bad-transcoder-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-webrtc-%{majorminor}.pc
+%{_libdir}/pkgconfig/gstreamer-vulkan-%{majorminor}.pc
 
 
 %changelog
+* Mon Jun 22 2020 Wim Taymans <wtaymans@redhat.com> - 1.17.1-1
+- Update to 1.17.1
+
 * Fri Mar 20 2020 Debarshi Ray <rishi@fedoraproject.org> - 1.16.2-4
 - Enable the spandsp plugin
 
diff --git a/gstreamer1-plugins-bad-lv2-make-it-build-with-fno-common.patch b/gstreamer1-plugins-bad-lv2-make-it-build-with-fno-common.patch
deleted file mode 100644
index 5bbb441..0000000
--- a/gstreamer1-plugins-bad-lv2-make-it-build-with-fno-common.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 89d17470cfa9b52402e97cbafdd95242b880856e Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <rishi@gnu.org>
-Date: Fri, 20 Mar 2020 15:49:06 +0100
-Subject: [PATCH] lv2: Make it build with -fno-common
-
-GCC 10 defaults to -fno-common. This means that global variables shared
-across multiple translation units should be declared as 'extern' in
-header files and defined in exactly one C file. See:
-https://gcc.gnu.org/gcc-10/porting_to.html
-
-https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1125
----
- ext/lv2/gstlv2.c | 33 ++++++++++++++++++++++++++
- ext/lv2/gstlv2.h | 62 ++++++++++++++++++++++++------------------------
- 2 files changed, 64 insertions(+), 31 deletions(-)
-
-diff --git a/ext/lv2/gstlv2.c b/ext/lv2/gstlv2.c
-index 60d502f41af9..7feeee192144 100644
---- a/ext/lv2/gstlv2.c
-+++ b/ext/lv2/gstlv2.c
-@@ -69,6 +69,39 @@ GST_DEBUG_CATEGORY (lv2_debug);
- #error "Unsupported OS"
- #endif
- 
-+LilvWorld *world = NULL;
-+LilvNode *atom_class = NULL;
-+LilvNode *audio_class = NULL;
-+LilvNode *control_class = NULL;
-+LilvNode *cv_class = NULL;
-+LilvNode *event_class = NULL;
-+LilvNode *input_class = NULL;
-+LilvNode *output_class = NULL;
-+LilvNode *preset_class = NULL;
-+LilvNode *state_iface = NULL;
-+LilvNode *state_uri = NULL;
-+
-+LilvNode *integer_prop = NULL;
-+LilvNode *toggled_prop = NULL;
-+LilvNode *designation_pred = NULL;
-+LilvNode *in_place_broken_pred = NULL;
-+LilvNode *optional_pred = NULL;
-+LilvNode *group_pred = NULL;
-+LilvNode *supports_event_pred = NULL;
-+LilvNode *label_pred = NULL;
-+
-+LilvNode *center_role = NULL;
-+LilvNode *left_role = NULL;
-+LilvNode *right_role = NULL;
-+LilvNode *rear_center_role = NULL;
-+LilvNode *rear_left_role = NULL;
-+LilvNode *rear_right_role = NULL;
-+LilvNode *lfe_role = NULL;
-+LilvNode *center_left_role = NULL;
-+LilvNode *center_right_role = NULL;
-+LilvNode *side_left_role = NULL;
-+LilvNode *side_right_role = NULL;
-+
- GstStructure *lv2_meta_all = NULL;
- 
- static void
-diff --git a/ext/lv2/gstlv2.h b/ext/lv2/gstlv2.h
-index 177f9b2c19cd..9f7258229445 100644
---- a/ext/lv2/gstlv2.h
-+++ b/ext/lv2/gstlv2.h
-@@ -28,40 +28,40 @@
- 
- #include "gstlv2utils.h"
- 
--LilvWorld *world;
--LilvNode *atom_class;
--LilvNode *audio_class;
--LilvNode *control_class;
--LilvNode *cv_class;
--LilvNode *event_class;
--LilvNode *input_class;
--LilvNode *output_class;
--LilvNode *preset_class;
--LilvNode *state_iface;
--LilvNode *state_uri;
-+extern LilvWorld *world;
-+extern LilvNode *atom_class;
-+extern LilvNode *audio_class;
-+extern LilvNode *control_class;
-+extern LilvNode *cv_class;
-+extern LilvNode *event_class;
-+extern LilvNode *input_class;
-+extern LilvNode *output_class;
-+extern LilvNode *preset_class;
-+extern LilvNode *state_iface;
-+extern LilvNode *state_uri;
- 
--LilvNode *integer_prop;
--LilvNode *toggled_prop;
--LilvNode *designation_pred;
--LilvNode *in_place_broken_pred;
--LilvNode *optional_pred;
--LilvNode *group_pred;
--LilvNode *supports_event_pred;
--LilvNode *label_pred;
-+extern LilvNode *integer_prop;
-+extern LilvNode *toggled_prop;
-+extern LilvNode *designation_pred;
-+extern LilvNode *in_place_broken_pred;
-+extern LilvNode *optional_pred;
-+extern LilvNode *group_pred;
-+extern LilvNode *supports_event_pred;
-+extern LilvNode *label_pred;
- 
--LilvNode *center_role;
--LilvNode *left_role;
--LilvNode *right_role;
--LilvNode *rear_center_role;
--LilvNode *rear_left_role;
--LilvNode *rear_right_role;
--LilvNode *lfe_role;
--LilvNode *center_left_role;
--LilvNode *center_right_role;
--LilvNode *side_left_role;
--LilvNode *side_right_role;
-+extern LilvNode *center_role;
-+extern LilvNode *left_role;
-+extern LilvNode *right_role;
-+extern LilvNode *rear_center_role;
-+extern LilvNode *rear_left_role;
-+extern LilvNode *rear_right_role;
-+extern LilvNode *lfe_role;
-+extern LilvNode *center_left_role;
-+extern LilvNode *center_right_role;
-+extern LilvNode *side_left_role;
-+extern LilvNode *side_right_role;
- 
--GstStructure *lv2_meta_all;
-+extern GstStructure *lv2_meta_all;
- 
- void gst_lv2_filter_register_element (GstPlugin *plugin,
-                                       GstStructure * lv2_meta);
--- 
-2.24.1
-