Merge branch 'dev-3.0'

diff --git a/ffmpeg3.patch b/ffmpeg3.patch
deleted file mode 100644 (file)
index 2ca88b7..0000000
--- a/ffmpeg3.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-diff -ruNp vlc-2.2.3.orig/configure.ac vlc-2.2.3/configure.ac
---- vlc-2.2.3.orig/configure.ac        2016-04-05 02:45:40.000000000 +0200
-+++ vlc-2.2.3/configure.ac     2016-05-21 19:19:05.527202127 +0200
-@@ -2323,9 +2323,6 @@ AC_ARG_ENABLE(avcodec,
- [  --enable-avcodec        libavcodec codec (default enabled)])
- AS_IF([test "${enable_avcodec}" != "no"], [
-   PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
--    PKG_CHECK_EXISTS([libavutil < 55],, [
--      AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
--    ])
-     VLC_SAVE_FLAGS
-     CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
-     CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
-@@ -2382,9 +2379,6 @@ have_avcodec_vaapi="no"
- AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
-   case "${avfork}" in
-     ffmpeg)
--      PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
--        AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
--      ])
-       ;;
-   esac
-   VLC_SAVE_FLAGS
-@@ -2416,9 +2410,6 @@ AS_IF([test "${enable_dxva2}" != "no"],
-   AS_IF([test "x${have_avcodec}" = "xyes"], [
-     case "${avfork}" in
-       ffmpeg)
--        PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
--          AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
--        ])
-         ;;
-     esac
-     AC_CHECK_HEADERS(dxva2api.h,
-@@ -3180,9 +3171,6 @@ AS_IF([test "${have_vdpau}" = "yes" -a "
-   case "${avfork}" in
-     libav) av_vdpau_ver="55.26.0" ;;
-     ffmpeg) av_vdpau_ver="55.42.100"
--      PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
--        AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
--      ])
-       ;;
-   esac
-   PKG_CHECK_EXISTS([libavutil >= 52.4.0 libavcodec >= ${av_vdpau_ver}], [
-diff -ruNp vlc-2.2.3.orig/modules/codec/avcodec/audio.c vlc-2.2.3/modules/codec/avcodec/audio.c
---- vlc-2.2.3.orig/modules/codec/avcodec/audio.c       2015-12-08 17:18:56.000000000 +0100
-+++ vlc-2.2.3/modules/codec/avcodec/audio.c    2016-05-21 19:19:05.527202127 +0200
-@@ -39,7 +39,6 @@
- #include <libavcodec/avcodec.h>
- #include <libavutil/mem.h>
- 
--#include <libavutil/audioconvert.h>
- 
- #include "avcodec.h"
- 
-diff -ruNp vlc-2.2.3.orig/modules/codec/avcodec/encoder.c vlc-2.2.3/modules/codec/avcodec/encoder.c
---- vlc-2.2.3.orig/modules/codec/avcodec/encoder.c     2015-10-21 18:36:45.000000000 +0200
-+++ vlc-2.2.3/modules/codec/avcodec/encoder.c  2016-05-21 19:19:07.451194268 +0200
-@@ -41,7 +41,6 @@
- #include <vlc_cpu.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- 
- #include "avcodec.h"
- #include "avcommon.h"
-@@ -311,7 +310,7 @@ int OpenEncoder( vlc_object_t *p_this )
-     else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
-                              &psz_namecodec ) )
-     {
--        if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE )
-+        if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE )
-             return VLC_EGENERIC; /* handed chroma output */
- 
-         i_cat      = VIDEO_ES;
-@@ -555,7 +554,7 @@ int OpenEncoder( vlc_object_t *p_this )
- 
-         if( p_codec->pix_fmts )
-         {
--            const enum PixelFormat *p = p_codec->pix_fmts;
-+            const enum AVPixelFormat *p = p_codec->pix_fmts;
-             for( ; *p != -1; p++ )
-             {
-                 if( *p == p_context->pix_fmt ) break;
-@@ -1017,7 +1016,7 @@ errmsg:
-         }
-     }
- 
--    p_sys->frame = avcodec_alloc_frame();
-+    p_sys->frame = av_frame_alloc();
-     if( !p_sys->frame )
-     {
-         goto error;
-@@ -1088,7 +1087,7 @@ static block_t *EncodeVideo( encoder_t *
-     AVFrame *frame = NULL;
-     if( likely(p_pict) ) {
-         frame = p_sys->frame;
--        avcodec_get_frame_defaults( frame );
-+        av_frame_unref( frame );
-         for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
-         {
-             p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
-@@ -1329,7 +1328,7 @@ static block_t *handle_delay_buffer( enc
-     //How much we need to copy from new packet
-     const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes;
- 
--    avcodec_get_frame_defaults( p_sys->frame );
-+    av_frame_unref( p_sys->frame );
-     p_sys->frame->format     = p_sys->p_context->sample_fmt;
-     p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
- 
-@@ -1451,7 +1450,7 @@ static block_t *EncodeAudio( encoder_t *
-     while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) ||
-            ( p_sys->b_variable && p_aout_buf->i_nb_samples ) )
-     {
--        avcodec_get_frame_defaults( p_sys->frame );
-+        av_frame_unref( p_sys->frame );
-         if( p_sys->b_variable )
-             p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
-         else
-@@ -1514,7 +1513,7 @@ void CloseEncoder( vlc_object_t *p_this
-     encoder_t *p_enc = (encoder_t *)p_this;
-     encoder_sys_t *p_sys = p_enc->p_sys;
- 
--    /*FIXME: we should use avcodec_free_frame, but we don't require so new avcodec that has it*/
-+    /*FIXME: we should use av_frame_free, but we don't require so new avcodec that has it*/
-     av_freep( &p_sys->frame );
- 
-     vlc_avcodec_lock();
-diff -ruNp vlc-2.2.3.orig/modules/codec/avcodec/vaapi.c vlc-2.2.3/modules/codec/avcodec/vaapi.c
---- vlc-2.2.3.orig/modules/codec/avcodec/vaapi.c       2014-11-16 19:57:58.000000000 +0100
-+++ vlc-2.2.3/modules/codec/avcodec/vaapi.c    2016-05-21 19:19:07.452194264 +0200
-@@ -595,7 +595,7 @@ static int Create( vlc_va_t *p_va, AVCod
-         return err;
- 
-     /* Only VLD supported */
--    p_va->pix_fmt = PIX_FMT_VAAPI_VLD;
-+    p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD;
-     p_va->setup = Setup;
-     p_va->get = Get;
-     p_va->release = Release;
-diff -ruNp vlc-2.2.3.orig/modules/codec/avcodec/video.c vlc-2.2.3/modules/codec/avcodec/video.c
---- vlc-2.2.3.orig/modules/codec/avcodec/video.c       2016-04-05 02:45:24.000000000 +0200
-+++ vlc-2.2.3/modules/codec/avcodec/video.c    2016-05-21 19:19:07.453194260 +0200
-@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC
- static int  ffmpeg_GetFrameBuf    ( struct AVCodecContext *, AVFrame * );
- static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
- #endif
--static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
--                                          const enum PixelFormat * );
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *,
-+                                            const enum AVPixelFormat * );
- 
- static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
- {
-@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
-     p_sys->p_codec = p_codec;
-     p_sys->i_codec_id = i_codec_id;
-     p_sys->psz_namecodec = psz_namecodec;
--    p_sys->p_ff_pic = avcodec_alloc_frame();
-+    p_sys->p_ff_pic = av_frame_alloc();
-     p_sys->b_delayed_open = true;
-     p_sys->p_va = NULL;
-     vlc_sem_init( &p_sys->sem_mt, 0 );
-@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
-     if( ffmpeg_OpenCodec( p_dec ) < 0 )
-     {
-         msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
--        avcodec_free_frame( &p_sys->p_ff_pic );
-+        av_frame_free( &p_sys->p_ff_pic );
-         vlc_sem_destroy( &p_sys->sem_mt );
-         free( p_sys );
-         return VLC_EGENERIC;
-@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec )
-     wait_mt( p_sys );
- 
-     if( p_sys->p_ff_pic )
--        avcodec_free_frame( &p_sys->p_ff_pic );
-+        av_frame_free( &p_sys->p_ff_pic );
- 
-     if( p_sys->p_va )
-         vlc_va_Delete( p_sys->p_va );
-@@ -1313,8 +1313,8 @@ static void ffmpeg_ReleaseFrameBuf( stru
- }
- #endif
- 
--static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
--                                          const enum PixelFormat *pi_fmt )
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
-+                                            const enum AVPixelFormat *pi_fmt )
- {
-     decoder_t *p_dec = p_context->opaque;
-     decoder_sys_t *p_sys = p_dec->p_sys;
-@@ -1341,6 +1341,16 @@ static enum PixelFormat ffmpeg_GetFormat
-     if (!can_hwaccel)
-         goto end;
- 
-+#if (LIBAVCODEC_VERSION_MICRO >= 100) \
-+  && (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 83, 101))
-+    if (p_context->active_thread_type)
-+    {
-+        msg_Warn(p_dec, "thread type %d: disabling hardware acceleration",
-+                 p_context->active_thread_type);
-+        goto end;
-+    }
-+#endif
-+
-     /* Profile and level information is needed now.
-      * TODO: avoid code duplication with avcodec.c */
-     if( p_context->profile != FF_PROFILE_UNKNOWN)

diff --git a/no-cache.patch b/no-cache.patch
index a7c141d773225bd17f892bc056d3aebfddccc400..6e5009721f54d5a10f006fa83d77e9a009a981f6 100644 (file)
--- a/no-cache.patch
+++ b/no-cache.patch
@@ -4,7 +4,7 @@
  ../modules/plugins.dat: vlc-cache-gen$(EXEEXT)
        $(AM_V_at)rm -f ../modules/plugins.dat
        $(AM_V_GEN)if test "$(build)" = "$(host)"; then \
--              ./vlc-cache-gen$(EXEEXT) ../modules ; \
+-              ./vlc-cache-gen$(EXEEXT) `realpath ../modules` ; \
 +              echo "Cache generation skipped!" ; \
        else \
                echo "Cross-compilation: cache generation skipped!" ; \

diff --git a/vlc-buildflags.patch b/vlc-buildflags.patch
index 1e912f41f16c5f59af4f6730723c3953de8f5f33..8877e0d37f7ff4bd5c8d977f9dae7b5a991741d1 100644 (file)
--- a/vlc-buildflags.patch
+++ b/vlc-buildflags.patch
@@ -9,12 +9,3 @@
        [ have_lua=yes ],
        [
        AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua >= 5.1 instead])
-@@ -1644,7 +1644,7 @@
-       AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
-   fi
-   AC_ARG_VAR([LUAC], [LUA byte compiler])
--  AC_PATH_PROGS(LUAC,[${LUAC} luac], [false])
-+  AC_PATH_PROGS(LUAC,[${LUAC} luac51], [false])
-   AS_IF([test "${LUAC}" = "false"], [
-     AC_MSG_ERROR([Could not find the LUA byte compiler.])
-   ])

diff --git a/vlc-mpc.patch b/vlc-mpc.patch
new file mode 100644 (file)
index 0000000..dee8ecb
--- /dev/null
+++ b/vlc-mpc.patch
@@ -0,0 +1,11 @@
+--- configure.ac       2017-07-15 14:16:30.234621071 +0200
++++ configure.ac.orig  2017-07-10 04:26:50.000000000 +0200
+@@ -2127,7 +2127,7 @@
+ then
+   AC_CHECK_HEADERS([mpc/mpcdec.h], [
+     VLC_ADD_PLUGIN([mpc])
+-    VLC_ADD_LIBS([mpc],[-lmpcdec])],
++    VLC_ADD_LIBS([mpc],[-lmpcdecsv8])],
+     [AC_CHECK_HEADERS([mpcdec/mpcdec.h], [
+     VLC_ADD_PLUGIN([mpc])
+     VLC_ADD_LIBS([mpc],[-lmpcdec])])])

diff --git a/vlc-system-minizip.patch b/vlc-system-minizip.patch
deleted file mode 100644 (file)
index 2229e52..0000000
--- a/vlc-system-minizip.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- vlc-1.0.3/modules/access/zip/zip.h~        2009-05-19 18:28:15.000000000 +0200
-+++ vlc-1.0.3/modules/access/zip/zip.h 2009-11-09 08:55:10.291272459 +0100
-@@ -35,8 +35,8 @@
- #include <vlc_arrays.h>
- #include <vlc_plugin.h>
- #include <vlc_stream.h>
--#include "unzip.h"
--#include "ioapi.h"
-+#include <minizip/unzip.h>
-+#include <minizip/ioapi.h>
- 
- #include <assert.h>
- 
---- vlc-1.0.3/modules/gui/skins2/src/theme_loader.hpp~ 2009-05-11 01:03:55.000000000 +0200
-+++ vlc-1.0.3/modules/gui/skins2/src/theme_loader.hpp  2009-11-09 09:03:05.275599954 +0100
-@@ -28,7 +28,7 @@
- #include "skin_common.hpp"
- #include <string>
- #if defined( HAVE_ZLIB_H )
--#   include "unzip.h"
-+#   include <minizip/unzip.h>
- #endif
- 
- class ThemeLoader: public SkinObject

diff --git a/vlc.spec b/vlc.spec
index a9f7e7100123015fee1598270291c0d83d652212..127a5de88ebe4731257c8252c72f16c0415ec411 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -21,13 +21,11 @@
 %bcond_without caca            # caca video output plugin
 %bcond_without crystalhd       # crystalhd codec plugin
 %bcond_with    decklink        # Blackmagic DeskLink output support (BR: proprietary SDK)
-%bcond_without directfb        # directfb video output plugin
 %bcond_without dv              # dv access plugins
 %bcond_with    fdk_aac         # FDK-AAC encoder plugin (GPL 3 incompatible; enable as subpackage?)
 %bcond_with    freerdp         # RDP/Remote Desktop client support
 %bcond_with    glesv1          # OpenGL ES v1 support
 %bcond_with    glesv2          # OpenGL ES v2 support
-%bcond_without gnomevfs        # gnomevfs access plugin
 %bcond_without gnutls          # gnutls misc plugin
 %bcond_without jack            # jack access/audio output plugin
 %bcond_without kde             # KDE Solid actions
@@ -53,8 +51,7 @@
 %bcond_without x265            # x265 codec plugin
 %bcond_without xmas            # disable "xmas joke" icons provided by vlc [unmaintained patch]
 
-%define                qt4_ver 4.8.3
-%define                qt5_ver 5.6.0
+%define                qt_ver  5.5.0
 
 %ifnarch i686 pentium4 athlon %{x8664} x32
 # CrystalHD library requires SSE2 instructions
@@ -66,39 +63,34 @@
 Summary:       VLC - a multimedia player and stream server
 Summary(pl.UTF-8):     VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:          vlc
-Version:       2.2.6
-Release:       5
+Version:       3.0.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 031d1bbef7737d44d18d78d6761ed26e
+# Source0-md5: a953d8b90e56f06828c4ca8e390c5c9b
 Patch0:                %{name}-buildflags.patch
 Patch1:                %{name}-tremor.patch
-Patch2:                %{name}-system-minizip.patch
+Patch2:                %{name}-mpc.patch
 Patch3:                xmas-sucks.patch
-Patch4:                ffmpeg3.patch
-Patch5:                no-cache.patch
+Patch4:                no-cache.patch
 URL:           http://www.videolan.org/vlc/
-%{?with_directfb:BuildRequires:        DirectFB-devel}
 # 1.0 for X11 or GLESv1, 1.1 for GLESv2
 BuildRequires: EGL-devel >= %{?with_glesv2:1.1}%{!?with_glesv2:1.0}
 BuildRequires: OpenGL-devel
 %{?with_glesv1:BuildRequires:  OpenGLESv1-devel >= 1.1}
 %{?with_glesv2:BuildRequires:  OpenGLESv2-devel >= 2.0}
-%if %{with qt5}
-BuildRequires: Qt5Core-devel >= %{qt5_ver}
-BuildRequires: Qt5Gui-devel >= %{qt5_ver}
-BuildRequires: Qt5Widgets-devel >= %{qt5_ver}
-BuildRequires: Qt5X11Extras-devel >= %{qt5_ver}
-%else
-BuildRequires: QtCore-devel >= %{qt4_ver}
-BuildRequires: QtGui-devel >= %{qt4_ver}
-%endif
-BuildRequires: SDL-devel >= 1.2.10
+BuildRequires: Qt5Core-devel >= %{qt_ver}
+BuildRequires: Qt5Gui-devel >= %{qt_ver}
+BuildRequires: Qt5Svg-devel >= %{qt_ver}
+BuildRequires: Qt5Widgets-devel >= %{qt_ver}
+BuildRequires: Qt5X11Extras-devel >= %{qt_ver}
 BuildRequires: SDL_image-devel >= 1.2.10
 BuildRequires: a52dec-libs-devel >= 0.7.3
 %{?with_aalib:BuildRequires:   aalib-devel}
 %{?with_alsa:BuildRequires:    alsa-lib-devel >= 1.0.24}
+BuildRequires: aribb24-devel >= 1.0.1
+BuildRequires: aribb25-devel >= 0.2.6
 BuildRequires: asdcplib-devel
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -109,26 +101,27 @@ BuildRequires:    dbus-devel >= 1.6.0
 BuildRequires: desktop-file-utils
 BuildRequires: faad2-devel >= 2.5
 %{?with_fdk_aac:BuildRequires: fdk-aac-devel}
-# libavcodec >= 55.42.100, libavformat >= 53.21.0, libavutil >= 52.4.0, libswscale, libpostproc
-BuildRequires: ffmpeg-devel >= 0.4.9-4.20080131.1
+# libavcodec >= 57.37.100, libavformat >= 53.21.0, libavutil >= 52.4.0, libswscale, libpostproc
+BuildRequires: ffmpeg-devel >= 3.1
 BuildRequires: flac-devel >= 1.1.3
 BuildRequires: fluidsynth-devel >= 1.1.2
-BuildRequires: fontconfig-devel
+BuildRequires: fontconfig-devel >= 2.11
 %{?with_freerdp:BuildRequires: freerdp-devel >= 1.0.1}
 BuildRequires: freetype-devel >= 2
 BuildRequires: fribidi-devel
 BuildRequires: game-music-emu-devel
 BuildRequires: gettext-tools >= 0.18.3
-%{?with_gnomevfs:BuildRequires:        gnome-vfs2-devel >= 2.0}
-%{?with_gnutls:BuildRequires:  gnutls-devel >= 3.0.20}
+%{?with_gnutls:BuildRequires:  gnutls-devel >= 3.3.6}
 BuildRequires: gstreamer-plugins-base-devel >= 1.0
 %{?with_notify:BuildRequires:  gtk+2-devel >= 2.0}
+BuildRequires: harfbuzz-devel
 # >= 0.120.1 < 1.0 or >= 1.9.7
 %{?with_jack:BuildRequires:    jack-audio-connection-kit-devel >= 0.120.1}
 %{?with_kde:BuildRequires:     kde4-kdelibs}
+BuildRequires: libarchive-devel >= 3.1.0
 BuildRequires: libass-devel >= 0.9.8
 %{?with_dv:BuildRequires:      libavc1394-devel >= 0.5.3}
-BuildRequires: libbluray-devel >= 0.3.0
+BuildRequires: libbluray-devel >= 0.6.2
 %{?with_caca:BuildRequires:    libcaca-devel >= 0.99-0.beta14}
 BuildRequires: libcddb-devel >= 0.9.5
 BuildRequires: libcdio-devel >= 0.78.2
@@ -136,11 +129,11 @@ BuildRequires:    libchromaprint-devel >= 0.6.0
 %{?with_crystalhd:BuildRequires:       libcrystalhd-devel}
 BuildRequires: libdc1394-devel >= 2.1.0
 BuildRequires: libdts-devel >= 0.0.5
-BuildRequires: libdvbpsi-devel >= 1.1.0
+BuildRequires: libdvbpsi-devel >= 1.2.0
 BuildRequires: libdvdnav-devel >= 4.9.1
 BuildRequires: libdvdread-devel >= 4.9.1
 BuildRequires: libebml-devel >= 1.0.0
-BuildRequires: libgcrypt-devel >= 1.1.94
+BuildRequires: libgcrypt-devel >= 1.6.0
 BuildRequires: libgoom2-devel
 BuildRequires: libidn-devel
 BuildRequires: libjpeg-devel
@@ -149,10 +142,12 @@ BuildRequires:    libmad-devel
 BuildRequires: libmatroska-devel >= 1.0.0
 # >= 0.8.4 but not 0.8.8
 BuildRequires: libmodplug-devel >= 0.8.4
-BuildRequires: libmpcdec-devel >= 1.2.1
+BuildRequires: musepack-devel
 BuildRequires: libmpeg2-devel > 0.3.2
+BuildRequires: libmpg123-devel
 BuildRequires: libmtp-devel >= 1.0.0
 %{?with_notify:BuildRequires:  libnotify-devel}
+BuildRequires: libnfs-devel >= 1.10.0
 BuildRequires: libogg-devel >= 1:1.0
 BuildRequires: libpng-devel
 %{?with_projectM:BuildRequires:        libprojectM-devel >= 2.0.1-3}
@@ -160,6 +155,7 @@ BuildRequires:      libproxy-devel
 %{?with_dv:BuildRequires:      libraw1394-devel >= 2.0.1}
 %{?with_svg:BuildRequires:     librsvg-devel >= 2.9.0}
 BuildRequires: libsamplerate-devel
+BuildRequires: libsecret-devel >= 0.18
 %{?with_shout:BuildRequires:   libshout-devel >= 2.1}
 BuildRequires: libsidplay2-devel
 %{?with_smb:BuildRequires:     libsmbclient-devel >= 3.6.13}
@@ -171,12 +167,13 @@ BuildRequires:    libtiger-devel >= 0.3.1
 BuildRequires: libtool >= 2:2
 %{?with_upnp:BuildRequires:    libupnp-devel}
 BuildRequires: libv4l-devel
-BuildRequires: libva-x11-devel
+BuildRequires: libva-devel >= 0.38
 BuildRequires: libva-drm-devel
+BuildRequires: libva-x11-devel
 BuildRequires: libvdpau-devel >= 0.6
 BuildRequires: libvncserver-devel >= 0.9.9
 BuildRequires: libvorbis-devel >= 1:1.1
-BuildRequires: libvpx-devel
+BuildRequires: libvpx-devel >= 1.5.0
 # x264.pc >= 0.86
 %{?with_x264:BuildRequires:    libx264-devel}
 %{?with_x265:BuildRequires:    libx265-devel}
@@ -188,27 +185,26 @@ BuildRequires:    libxml2-devel >= 1:2.5
 BuildRequires: lua52 >= 5.2
 BuildRequires: lua52-devel >= 5.2
 %{?with_mfx:BuildRequires:     mfx_dispatch-devel}
+BuildRequires: microdns-devel
 BuildRequires: minizip-devel
 BuildRequires: ncurses-devel
 %{?with_opencv:BuildRequires:  opencv-devel > 2.0}
 BuildRequires: opus-devel >= 1.0.3
 BuildRequires: pkgconfig >= 1:0.9.0
+BuildRequires: protobuf-devel >= 2.5.0
 BuildRequires: pulseaudio-devel >= 1.0
-%if %{with qt5}
-BuildRequires: qt5-build >= %{qt5_ver}
-%else
-BuildRequires: qt4-build >= %{qt4_ver}
-%endif
+BuildRequires: qt5-build >= %{qt_ver}
 BuildRequires: schroedinger-devel >= 1.0.10
 BuildRequires: shine-devel >= 3.0.0
+BuildRequires: soxr-devel >= 0.1.2
 %{?with_speex:BuildRequires:   speex-devel > 1:1.1.0}
 %{?with_speex:BuildRequires:   speexdsp-devel >= 1.2}
 BuildRequires: sysfsutils-devel
+BuildRequires: systemd-devel
 BuildRequires: taglib-devel >= 1.9
 BuildRequires: tremor-devel
 %{?with_twolame:BuildRequires: twolame-devel}
 %{?with_udev:BuildRequires:    udev-devel >= 1:142}
-BuildRequires: vcdimager-devel >= 0.7.22
 %{?with_vsxu:BuildRequires:    vsxu-devel}
 BuildRequires: xcb-util-keysyms-devel >= 0.3.4
 BuildRequires: xorg-lib-libX11-devel
@@ -224,6 +220,7 @@ Requires:   lua52-libs > 5.2.3-2
 Requires:      xdg-utils
 Obsoletes:     browser-plugin-vlc
 Obsoletes:     vlc-GGI
+Obsoletes:     vlc-SDL
 Obsoletes:     vlc-esd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -272,8 +269,11 @@ Summary:   VLC - X11 output plugin
 Summary(pl.UTF-8):     Klient VLC - wtyczka wyjścia X11
 Group:         X11/Applications/Multimedia
 Requires:      %{name} = %{version}-%{release}
-Requires:      QtCore >= %{qt4_ver}
-Requires:      QtGui >= %{qt4_ver}
+Requires:      Qt5Core >= %{qt_ver}
+Requires:      Qt5Gui >= %{qt_ver}
+Requires:      Qt5Svg >= %{qt_ver}
+Requires:      Qt5Widgets >= %{qt_ver}
+Requires:      Qt5X11Extras >= %{qt_ver}
 Requires:      desktop-file-utils
 Suggests:      dbus-x11 >= 1.6.0
 Suggests:      libcaca > 0.99-0.beta14.1
@@ -299,19 +299,6 @@ fb output plugin for VLC.
 %description fb -l pl.UTF-8
 Wtyczka wyjścia fb dla klienta VLC.
 
-%package SDL
-Summary:       VLC - SDL output plugin
-Summary(pl.UTF-8):     Klient VLC - wtyczka wyjścia SDL
-Group:         Applications/Multimedia
-Requires:      %{name} = %{version}-%{release}
-Requires:      SDL >= 1.2.10
-
-%description SDL
-SDL output plugin for VLC.
-
-%description SDL -l pl.UTF-8
-Wtyczka wyjścia SDL dla klienta VLC.
-
 %package alsa
 Summary:       VLC - ALSA audio output plugin
 Summary(pl.UTF-8):     Klient VLC - wtyczka wyjścia dźwięku ALSA
@@ -353,16 +340,11 @@ Akcje klienta VLC dla Solid.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+%patch2 -p0
 %if %{without xmas}
 %patch3 -p1
 %endif
 %patch4 -p1
-%patch5 -p1
-
-%if %{without qt5}
-sed -i -e 's#Qt5#WANT_QT4#g' configure.ac
-%endif
 
 %build
 %{__libtoolize}
@@ -374,6 +356,7 @@ sed -i -e 's#Qt5#WANT_QT4#g' configure.ac
 # --disable-optimizations is to use own RPM_OPT_FLAGS optimalizations
 # iomx is Android-specific omxil codec option
 %configure \
+       BUILDCC="%{__cc}" \
        CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -I/usr/include/xulrunner/stable -I/usr/include/liveMedia" \
 %if %{with decklink}
        CPPFLAGS_decklink=-I/usr/include/decklink \
@@ -394,7 +377,6 @@ sed -i -e 's#Qt5#WANT_QT4#g' configure.ac
        --enable-crystalhd%{!?with_crystalhd:=no} \
        --enable-dbus \
        --enable-decklink%{!?with_decklink:=no} \
-       %{?with_directfb:--enable-directfb} \
        --enable-dv1394%{!?with_dv:=no} \
        --enable-dvbpsi \
        --enable-dvdnav \
@@ -407,7 +389,6 @@ sed -i -e 's#Qt5#WANT_QT4#g' configure.ac
        --enable-fribidi \
        %{?with_glesv1:--enable-gles1} \
        %{?with_glesv2:--enable-gles2} \
-       %{!?with_gnomevfs:--disable-gnomevfs} \
        %{!?with_gnutls:--disable-gnutls} \
        %{?with_jack:--enable-jack} \
        --enable-lirc%{!?with_lirc:=no} \
@@ -423,7 +404,6 @@ sed -i -e 's#Qt5#WANT_QT4#g' configure.ac
        --enable-oss%{!?with_oss4:=no} \
        %{!?with_projectM:--disable-projectm} \
        --enable-realrtsp \
-       --enable-sdl \
        %{?with_sftp:--enable-sftp} \
        --enable-shared \
        --enable-shine \
@@ -440,7 +420,6 @@ sed -i -e 's#Qt5#WANT_QT4#g' configure.ac
        %{!?with_udev:--disable-udev} \
        %{?with_upnp:--enable-upnp} \
        --enable-v4l2 \
-       --enable-vcdx \
        %{!?with_vsxu:--disable-vsxu} \
        %{!?with_x264:--disable-x264} \
        %{!?with_x265:--disable-x265} \
@@ -470,13 +449,12 @@ ln -sf %{_libdir}/vlc $RPM_BUILD_ROOT%{_prefix}/lib
 find $RPM_BUILD_ROOT%{_libdir} -type f -regex '.*\.l?a$' | xargs %{__rm}
 
 %{__mv} $RPM_BUILD_ROOT%{_localedir}/{pt_PT,pt}
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/{ks_IN,ks}
 # unsupported:
 # ach (Acoli)
 # cgg (Chiga)
 # co (Corsican)
 # tet (Tetum)
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{ach,cgg,co,tet}
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{ach,as_IN,cgg,co,ks_IN,tet}
 
 # .ico is win32 only
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/vlc/vlc*.ico
@@ -488,19 +466,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins || :
+%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins || :
 
 %postun        -p /sbin/ldconfig
 
 %post X11
 %update_desktop_database
-%{_libdir}/vlc/vlc-cache-gen -f %{_libdir}/vlc/plugins || :
+%{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins || :
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README THANKS
-%doc doc/bugreport-howto.txt
-%doc doc/intf-vcd.txt doc/translations.txt
+#%doc doc/bugreport-howto.txt
+%doc doc/translations.txt
 %attr(755,root,root) %{_bindir}/cvlc
 %attr(755,root,root) %{_bindir}/nvlc
 %attr(755,root,root) %{_bindir}/rvlc
@@ -510,14 +488,18 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libvlc.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libvlc.so.5
 %attr(755,root,root) %{_libdir}/libvlccore.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvlccore.so.8
+%attr(755,root,root) %ghost %{_libdir}/libvlccore.so.9
 %if "%{_lib}" != "lib"
 %{_prefix}/lib/vlc
 %endif
 %dir %{_libdir}/vlc
+%attr(755,root,root) %{_libdir}/vlc/libvlc_pulse.so.*.*.*
+%attr(755,root,root) %{_libdir}/vlc/libvlc_pulse.so.0
 # R: libX11
 %attr(755,root,root) %{_libdir}/vlc/libvlc_vdpau.so.*.*.*
 %attr(755,root,root) %{_libdir}/vlc/libvlc_vdpau.so.0
+%attr(755,root,root) %{_libdir}/vlc/libvlc_xcb_events.so.*.*.*
+%attr(755,root,root) %{_libdir}/vlc/libvlc_xcb_events.so.0
 
 %dir %{_libdir}/vlc/plugins
 %ghost %{_libdir}/vlc/plugins/plugins.dat
@@ -526,7 +508,8 @@ rm -rf $RPM_BUILD_ROOT
 # R: alsa-lib >= 1.0.24
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libaccess_alsa_plugin.so
 %endif
-%attr(755,root,root) %{_libdir}/vlc/plugins/access/libaccess_bd_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/access/libaccess_concat_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/access/libaccess_imem_plugin.so
 %if %{with jack}
 # R: jack-audio-connection-kit-libs >= 0.120.1 < 1.0 or >= 1.9.7 (depending on build)
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
@@ -548,13 +531,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libdv1394_plugin.so
 %endif
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libftp_plugin.so
-%if %{with gnomevfs}
-# R: gnome-vfs2
-%attr(755,root,root) %{_libdir}/vlc/plugins/access/libgnomevfs_plugin.so
-%endif
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libhttp_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/access/libhttps_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libimem_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/access/librar_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/access/libnfs_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/access/libsatip_plugin.so
 %if %{with sftp}
 # R: libssh2
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libsftp_plugin.so
@@ -604,10 +585,7 @@ rm -rf $RPM_BUILD_ROOT
 %{?with_v4l1:%attr(755,root,root) %{_libdir}/vlc/plugins/access/libv4l_plugin.so}
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libv4l2_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libvcd_plugin.so
-# R: libcdio >= 0.78.2, vcdimager >= 0.7.22
-%attr(755,root,root) %{_libdir}/vlc/plugins/access/libvcdx_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/access/libzip_plugin.so
 %dir %{_libdir}/vlc/plugins/access_output
 %attr(755,root,root) %{_libdir}/vlc/plugins/access_output/libaccess_output_dummy_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access_output/libaccess_output_file_plugin.so
@@ -621,33 +599,31 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/access_output/libaccess_output_udp_plugin.so
 %dir %{_libdir}/vlc/plugins/audio_filter
 # R: a52dec-libs >= 0.7.3
-%attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/liba52tofloat32_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/liba52tospdif_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libaudio_format_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libaudiobargraph_a_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libchorus_flanger_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libcompressor_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libdolby_surround_decoder_plugin.so
-# R: libdts >= 0.0.5
-%attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libdtstofloat32_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libdtstospdif_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libequalizer_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libgain_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libheadphone_channel_mixer_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libkaraoke_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libmono_plugin.so
 # R: libmad
-%attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libmpgatofixed32_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libmad_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libmono_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libnormvol_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libparam_eq_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libremap_plugin.so
 # R: libsamplerate
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libsamplerate_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libscaletempo_pitch_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libsoxr_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libscaletempo_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libsimple_channel_mixer_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libspatializer_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libspeex_resampler_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libstereo_widen_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libtospdif_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libtrivial_channel_mixer_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libugly_resampler_plugin.so
 %dir %{_libdir}/vlc/plugins/audio_mixer
@@ -671,6 +647,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libaes3_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libadpcm_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libaraw_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libaribsub_plugin.so
 # R: ffmpeg-libs (libavcodec >= 54.34.0 libavutil >= 51.22.0)
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libavcodec_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libcc_plugin.so
@@ -680,7 +657,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libcrystalhd_plugin.so
 %endif
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libcvdsub_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libdts_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libdca_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libddummy_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libedummy_plugin.so
@@ -699,8 +676,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libg711_plugin.so
 # R: gstreamer-plugins-base >= 1.0
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libgstdecode_plugin.so
-# R: ffmpeg-libs (libavutil >= 52.4.0 libavcodec >= 55.42.100) libvdpau >= 0.6
-%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libhwdummy_plugin.so
 # R: libjpeg
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libjpeg_plugin.so
 # R: libkate >= 0.3.0 libtiger >= 0.3.1
@@ -710,7 +685,8 @@ rm -rf $RPM_BUILD_ROOT
 # R: libmpeg2-libs > 0.3.2
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/liblpcm_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libmpeg_audio_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libmpg123_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/codec/liboggspots_plugin.so
 # R: libomxil-bellagio (dlopened, no .so NEEDED dependency)
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libomxil_plugin.so
 # R: libomxil-bellagio (dlopened, no .so NEEDED dependency)
@@ -724,13 +700,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libqsv_plugin.so
 %endif
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/librawvideo_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/codec/librtpvideo_plugin.so
 # R: schroedinger >= 1.0.10
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libschroedinger_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libscte18_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libscte27_plugin.so
 # R: SDL_image >= 1.2.10
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libsdl_image_plugin.so
 # R: shine >= 3.0.0
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libshine_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libspdif_plugin.so
 %if %{with speex}
 # R: speex >= 1.0.5
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libspeex_plugin.so
@@ -747,15 +726,18 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libt140_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libtelx_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libtextst_plugin.so
 # R: libtheora >= 1.0
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libtheora_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libttml_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libuleaddvaudio_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libwebvtt_plugin.so
 %if %{with twolame}
 # R: twolame-libs
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libtwolame_plugin.so
 %endif
+%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libvaapi_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libvaapi_drm_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libvaapi_x11_plugin.so
 # R: libvorbis >= 1.1
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libvorbis_plugin.so
 # R: libvpx
@@ -783,6 +765,7 @@ rm -rf $RPM_BUILD_ROOT
 # R: xcb-util-keysyms >= 0.3.4
 %attr(755,root,root) %{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so
 %dir %{_libdir}/vlc/plugins/demux
+%attr(755,root,root) %{_libdir}/vlc/plugins/demux/libadaptive_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libaiff_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libasf_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libau_plugin.so
@@ -790,15 +773,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libavi_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libcaf_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libdemux_cdg_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/demux/libdemux_chromecast_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libdemux_stl_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libdemuxdump_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libdiracsys_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/demux/libdirectory_demux_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libes_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libflacsys_plugin.so
 # R: game-music-emu
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libgme_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/demux/libh264_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/demux/libhevc_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/demux/libh26x_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libimage_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libmjpeg_plugin.so
 # R: libebml >= 1.0.0 libmatroska >= 1.0.0
@@ -806,9 +790,10 @@ rm -rf $RPM_BUILD_ROOT
 # R: libmodplug >= 0.8.4, libmodplug != 0.8.8
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libmod_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libmp4_plugin.so
-# R: libmpcdec
+# R: musepack-libs
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libmpc_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libmpgv_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/demux/libnoseek_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libnsc_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libnsv_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libnuv_plugin.so
@@ -837,6 +822,16 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/vlc/plugins/gui
 # R: ncurses
 %attr(755,root,root) %{_libdir}/vlc/plugins/gui/libncurses_plugin.so
+%dir %{_libdir}/vlc/plugins/keystore
+%attr(755,root,root) %{_libdir}/vlc/plugins/keystore/libfile_keystore_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/keystore/libkwallet_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/keystore/libmemory_keystore_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/keystore/libsecret_plugin.so
+%dir %{_libdir}/vlc/plugins/logger
+%attr(755,root,root) %{_libdir}/vlc/plugins/logger/libconsole_logger_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/logger/libfile_logger_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/logger/libsd_journal_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/logger/libsyslog_plugin.so
 %dir %{_libdir}/vlc/plugins/lua
 # R: lua52
 %attr(755,root,root) %{_libdir}/vlc/plugins/lua/liblua_plugin.so
@@ -880,24 +875,28 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %dir %{_libdir}/vlc/plugins/packetizer
+%attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_a52_plugin.so
 # R: ffmpeg-libs (libavcodec >= 53.34.0 libavutil >= 51.22.0)
 %attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_avparser_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_copy_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_dirac_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_dts_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_flac_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_h264_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_mlp_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_mpeg4audio_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_mpeg4video_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_mpegaudio_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_mpegvideo_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/packetizer/libpacketizer_vc1_plugin.so
 %dir %{_libdir}/vlc/plugins/services_discovery
 %if %{with bonjour}
 # R: avahi-libs >= 0.6
-%attr(755,root,root) %{_libdir}/vlc/plugins/services_discovery/libbonjour_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/services_discovery/libavahi_plugin.so
 %endif
 %attr(755,root,root) %{_libdir}/vlc/plugins/services_discovery/libmediadirs_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/services_discovery/libmicrodns_plugin.so
 # R: libmtp >= 1.0.0
 %attr(755,root,root) %{_libdir}/vlc/plugins/services_discovery/libmtp_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/services_discovery/libpodcast_plugin.so
@@ -913,18 +912,35 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/services_discovery/libupnp_plugin.so
 %endif
 %attr(755,root,root) %{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so
+%dir %{_libdir}/vlc/plugins/spu
+%attr(755,root,root) %{_libdir}/vlc/plugins/spu/libaudiobargraph_v_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/spu/libdynamicoverlay_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/spu/liblogo_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/spu/libmarq_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/spu/libmosaic_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/spu/libremoteosd_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/spu/librss_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/spu/libsubsdelay_plugin.so
+%dir %{_libdir}/vlc/plugins/stream_extractor
+%attr(755,root,root) %{_libdir}/vlc/plugins/stream_extractor/libarchive_plugin.so
 %dir %{_libdir}/vlc/plugins/stream_filter
+%attr(755,root,root) %{_libdir}/vlc/plugins/stream_filter/libadf_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/stream_filter/libaribcam_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/stream_filter/libcache_block_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/stream_filter/libcache_read_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/stream_filter/libdecomp_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/stream_filter/libdash_plugin.so
-# R: libgcrypt >= 1.1.94
-%attr(755,root,root) %{_libdir}/vlc/plugins/stream_filter/libhttplive_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/stream_filter/libhds_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/stream_filter/libinflate_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/stream_filter/libprefetch_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/stream_filter/librecord_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/stream_filter/libsmooth_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/stream_filter/libskiptags_plugin.so
 %dir %{_libdir}/vlc/plugins/stream_out
 %attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_autodel_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_bridge_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_chromecast_plugin.so
 # R: libchromaprint >= 0.6.0
 %attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_chromaprint_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_cycle_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_delay_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_description_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_display_plugin.so
@@ -932,10 +948,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_duplicate_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_es_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_gather_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_langfromtelx_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_mosaic_bridge_plugin.so
 # R: libgcrypt >= 1.1.94
-%attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_raop_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_record_plugin.so
 # R: libgcrypt >= 1.1.94 (optional, for srtp functionality)
 %attr(755,root,root) %{_libdir}/vlc/plugins/stream_out/libstream_out_rtp_plugin.so
@@ -950,6 +964,8 @@ rm -rf $RPM_BUILD_ROOT
 # R: librsvg >= 2.9.0
 %attr(755,root,root) %{_libdir}/vlc/plugins/text_renderer/libsvg_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/text_renderer/libtdummy_plugin.so
+%dir %{_libdir}/vlc/plugins/vaapi
+%attr(755,root,root) %{_libdir}/vlc/plugins/vaapi/libvaapi_filters_plugin.so
 # R: libvdpau >= 0.6 (all plugins in vdpau dir)
 %dir %{_libdir}/vlc/plugins/vdpau
 %attr(755,root,root) %{_libdir}/vlc/plugins/vdpau/libvdpau_adjust_plugin.so
@@ -963,6 +979,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/vlc/plugins/video_chroma
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_chroma/libchain_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_chroma/libgrey_yuv_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/video_chroma/libi420_10_p010_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/video_chroma/libi420_nv12_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_chroma/libi420_rgb_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_chroma/libi422_i420_plugin.so
@@ -980,15 +998,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_chroma/librv32_plugin.so
 # R: ffmpeg-libs (libswscale)
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_chroma/libswscale_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/video_chroma/libyuvp_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_chroma/libyuy2_i420_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_chroma/libyuy2_i422_plugin.so
 %dir %{_libdir}/vlc/plugins/video_filter
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libadjust_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libantiflicker_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libanaglyph_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libaudiobargraph_v_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libalphamask_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libatmo_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libball_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libblend_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libblendbench_plugin.so
@@ -997,9 +1014,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libcolorthres_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libcroppadd_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libdeinterlace_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libdynamicoverlay_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libedgedetection_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/liberase_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libextract_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libfps_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libfreeze_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libgaussianblur_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libgradfun_plugin.so
@@ -1007,11 +1025,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libgrain_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libhqdn3d_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libinvert_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/liblogo_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libmagnify_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libmarq_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libmirror_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libmosaic_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/liboldmovie_plugin.so
@@ -1023,27 +1038,25 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libpsychedelic_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libpuzzle_plugin.so
 # R: libgcrypt >= 1.1.94
-%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libremoteosd_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libripple_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/librotate_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/librss_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libscale_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libscene_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libsepia_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libsharpen_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libsubsdelay_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libtransform_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libwave_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libvhs_plugin.so
-%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libyuvp_plugin.so
 %dir %{_libdir}/vlc/plugins/video_output
 %if %{with decklink}
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libdecklinkoutput_plugin.so
 %endif
-%if %{with directfb}
-# R: DirectFB
-%attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libdirectfb_plugin.so
-%endif
+%attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libegl_wl_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libflaschen_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libglconv_vaapi_drm_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libglconv_vaapi_wl_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libglconv_vaapi_x11_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libglconv_vdpau_plugin.so
 %if %{with glesv1}
 # R: OpenGLESv1 >= 1.1
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libgles1_plugin.so
@@ -1052,8 +1065,11 @@ rm -rf $RPM_BUILD_ROOT
 # R: OpenGLESv2 >= 2.0
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libgles2_plugin.so
 %endif
+%attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libwl_shell_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libwl_shm_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libvdummy_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libvmem_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libxdg_shell_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libyuv_plugin.so
 %dir %{_libdir}/vlc/plugins/video_splitter
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_splitter/libclone_plugin.so
@@ -1077,6 +1093,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/vlc
 %dir %{_datadir}/vlc/utils
 %attr(755,root,root) %{_datadir}/vlc/utils/*.sh
+%{_datadir}/metainfo/vlc.appdata.xml
 
 %{_mandir}/man1/vlc.1*
 %{_mandir}/man1/vlc-wrapper.1*
@@ -1085,7 +1102,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libvlc.so
 %attr(755,root,root) %{_libdir}/libvlccore.so
+%attr(755,root,root) %{_libdir}/vlc/libvlc_pulse.so
 %attr(755,root,root) %{_libdir}/vlc/libvlc_vdpau.so
+%attr(755,root,root) %{_libdir}/vlc/libvlc_xcb_events.so
 %{_includedir}/vlc
 %{_pkgconfigdir}/libvlc.pc
 %{_pkgconfigdir}/vlc-plugin.pc
@@ -1094,9 +1113,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qvlc
 %attr(755,root,root) %{_bindir}/svlc
-# R: QtCore QtGui >= %{qt4_ver}  or  Qt5Core Qt5Gui Qt5Widgets
-%attr(755,root,root) %{_libdir}/vlc/plugins/gui/libqt4_plugin.so
-# R: freetype libtar xorg-lib-lib{Xext,Xinerama,Xpm}  QtCore QtGui or Qt5Core Qt5Gui Qt5Widgets
+# R: QtCore QtGui >= %{qt_ver}
+%attr(755,root,root) %{_libdir}/vlc/plugins/gui/libqt_plugin.so
+# R: freetype libtar xorg-lib-lib{Xext,Xinerama,Xpm} QtCore QtGui
 %attr(755,root,root) %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
 %if %{with aalib}
 # R: aalib
@@ -1111,8 +1130,6 @@ rm -rf $RPM_BUILD_ROOT
 # R: OpenGL
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libgl_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libglx_plugin.so
-# R: OpenGL libxcb >= 1.6
-%attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
 # R: libxcb >= 1.6
@@ -1122,10 +1139,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/*/apps/vlc*.xpm
 %{_desktopdir}/vlc.desktop
 
-%files SDL
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libvout_sdl_plugin.so
-
 %files fb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libfb_plugin.so
@@ -1138,10 +1151,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files lua
 %defattr(644,root,root,755)
+%{_datadir}/vlc/lua
 %{_libdir}/vlc/lua
-%dir %{_datadir}/vlc/lua
-%dir %{_datadir}/vlc/lua/extensions
-%{_datadir}/vlc/lua/http
 
 %if %{with kde}
 %files solid