Merge branch 'dev-3.0'

diff --cc vlc.spec
index a9f7e7100123015fee1598270291c0d83d652212,aa288cf517bde1cca8892f0fcafc25883635eab1..127a5de88ebe4731257c8252c72f16c0415ec411
--- 1/vlc.spec
--- 2/vlc.spec
+++ b/vlc.spec
@@@ -20,8 -21,6 +20,7 @@@
  %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_with   decklink        # Blackmagic DeskLink output support (BR: proprietary SDK)
  %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
@@@ -374,11 -353,8 +356,12 @@@ Akcje klienta VLC dla Solid
  # --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 \
 +      CPPFLAGS_decklinkoutput=-I/usr/include/decklink \
 +%endif
        LUAC=luac5.2 \
        --disable-optimizations \
        --disable-silent-rules \
@@@ -393,8 -372,6 +376,7 @@@
        --enable-caca%{!?with_caca:=no} \
        --enable-crystalhd%{!?with_crystalhd:=no} \
        --enable-dbus \
-       %{?with_directfb:--enable-directfb} \
 +      --enable-decklink%{!?with_decklink:=no} \
        --enable-dv1394%{!?with_dv:=no} \
        --enable-dvbpsi \
        --enable-dvdnav \
@@@ -1034,16 -1036,13 +1047,16 @@@ rm -rf $RPM_BUILD_ROO
  %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 directfb}
- # R: DirectFB
- %attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libdirectfb_plugin.so
- %endif
 +%if %{with decklink}
 +%attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libdecklinkoutput_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