up to 20170710 snap

- SDL output and directfb plugin dropped
- updated BRs

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/vlc.spec b/vlc.spec
index 32d56a7dfa00c203c45e98f373d95815ea4438f5..a1a06d9d34b75fd7147134d8010d5622a0c2f6a1 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -21,7 +21,6 @@
 %bcond_without bonjour         # bonjour service discovery plugin
 %bcond_without caca            # caca video output plugin
 %bcond_without crystalhd       # crystalhd codec plugin
-%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
@@ -52,7 +51,7 @@
 %bcond_without xmas            # disable "xmas joke" icons provided by vlc [unmaintained patch]
 
 %define                qt_ver  5.2.0
-%define                snap    20170715-0247
+%define                snap    20170810-0240
 %define                rel     0.%(echo %{snap} | tr - _).1
 
 %ifnarch i686 pentium4 athlon %{x8664} x32
@@ -70,14 +69,13 @@ Release:    %{rel}
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       https://nightlies.videolan.org/build/source/vlc-%{version}-%{snap}-git.tar.xz
-# Source0-md5: e3612373592a0a2b43bef1ace08ad240
+# Source0-md5: fdc8b20f8b63ad37805b2d4494d1fa7d
 Patch0:                %{name}-buildflags.patch
 Patch1:                %{name}-tremor.patch
 Patch2:                %{name}-mpc.patch
 Patch3:                xmas-sucks.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
@@ -87,11 +85,12 @@ BuildRequires:      Qt5Core-devel >= %{qt_ver}
 BuildRequires: Qt5Gui-devel >= %{qt_ver}
 BuildRequires: Qt5Widgets-devel >= %{qt_ver}
 BuildRequires: Qt5X11Extras-devel >= %{qt_ver}
-BuildRequires: SDL-devel >= 1.2.10
 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
@@ -101,25 +100,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_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
@@ -127,11 +128,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
@@ -142,8 +143,10 @@ BuildRequires:     libmatroska-devel >= 1.0.0
 BuildRequires: libmodplug-devel >= 0.8.4
 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}
@@ -151,6 +154,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}
@@ -162,12 +166,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}
@@ -179,18 +184,22 @@ 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
 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}
@@ -209,6 +218,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)
 
@@ -286,19 +296,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
@@ -375,7 +372,6 @@ Akcje klienta VLC dla Solid.
        --enable-caca%{!?with_caca:=no} \
        --enable-crystalhd%{!?with_crystalhd:=no} \
        --enable-dbus \
-       %{?with_directfb:--enable-directfb} \
        --enable-dv1394%{!?with_dv:=no} \
        --enable-dvbpsi \
        --enable-dvdnav \
@@ -403,7 +399,6 @@ Akcje klienta VLC dla Solid.
        --enable-oss%{!?with_oss4:=no} \
        %{!?with_projectM:--disable-projectm} \
        --enable-realrtsp \
-       --enable-sdl \
        %{?with_sftp:--enable-sftp} \
        --enable-shared \
        --enable-shine \
@@ -642,6 +637,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
@@ -890,6 +886,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -918,6 +915,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -1041,10 +1039,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libwave_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libvhs_plugin.so
 %dir %{_libdir}/vlc/plugins/video_output
-%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
 %if %{with glesv1}
@@ -1129,10 +1123,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
@@ -1145,10 +1135,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files lua
 %defattr(644,root,root,755)
-%{_libdir}/vlc/lua
-%dir %{_datadir}/vlc/lua
-%dir %{_datadir}/vlc/lua/extensions
-%{_datadir}/vlc/lua/http
+%{_datadir}/vlc/lua
 
 %if %{with kde}
 %files solid