- rel 3; enable AV1

diff --git a/vlc-build.patch b/vlc-build.patch
new file mode 100644 (file)
index 0000000..a246200
--- /dev/null
+++ b/vlc-build.patch
@@ -0,0 +1,35 @@
+commit 622360c2c4335fff793f81f5e673326a581f5c0c
+Author: Martin Storsjö <martin@martin.st>
+Date:   Thu Apr 19 18:25:07 2018 +0300
+
+    aom: Remove unsupported pixel formats
+    
+    Support for these was apparently never in the codebase, and the enum
+    values were recently removed from the public headers [1].
+    
+    This fixes build with latest libaom build.
+    
+    [1] https://aomedia.googlesource.com/aom/+/3f29cc20e3a4c348cb41a797c68de856ddb84e12
+
+diff --git a/modules/codec/aom.c b/modules/codec/aom.c
+index 5bb442b5d5..60034158c4 100644
+--- a/modules/codec/aom.c
++++ b/modules/codec/aom.c
+@@ -116,17 +116,6 @@ static const struct
+ 
+     { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, 0 },
+     { VLC_CODEC_YUVA, AOM_IMG_FMT_444A, 8, 0 },
+-    { VLC_CODEC_YUYV, AOM_IMG_FMT_YUY2, 8, 0 },
+-    { VLC_CODEC_UYVY, AOM_IMG_FMT_UYVY, 8, 0 },
+-    { VLC_CODEC_YVYU, AOM_IMG_FMT_YVYU, 8, 0 },
+-
+-    { VLC_CODEC_RGB15, AOM_IMG_FMT_RGB555, 8, 0 },
+-    { VLC_CODEC_RGB16, AOM_IMG_FMT_RGB565, 8, 0 },
+-    { VLC_CODEC_RGB24, AOM_IMG_FMT_RGB24, 8, 0 },
+-    { VLC_CODEC_RGB32, AOM_IMG_FMT_RGB32, 8, 0 },
+-
+-    { VLC_CODEC_ARGB, AOM_IMG_FMT_ARGB, 8, 0 },
+-    { VLC_CODEC_BGRA, AOM_IMG_FMT_ARGB_LE, 8, 0 },
+ 
+     { VLC_CODEC_GBR_PLANAR, AOM_IMG_FMT_I444, 8, 1 },
+     { VLC_CODEC_GBR_PLANAR_10L, AOM_IMG_FMT_I44416, 10, 1 },

diff --git a/vlc.spec b/vlc.spec
index 78a3c027f26e0fe4e4b7ecfc6f2d70f968d7de14..be5d79d9a062fcabfc07874f02ab12671ae38b26 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -64,7 +64,7 @@ Summary:      VLC - a multimedia player and stream server
 Summary(pl.UTF-8):     VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:          vlc
 Version:       3.0.3
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz
@@ -75,6 +75,7 @@ Patch2:               %{name}-mpc.patch
 Patch3:                xmas-sucks.patch
 Patch4:                no-cache.patch
 Patch5:                %{name}-fribidi-1.0.patch
+Patch6:                %{name}-build.patch
 URL:           http://www.videolan.org/vlc/
 # 1.0 for X11 or GLESv1, 1.1 for GLESv2
 BuildRequires: EGL-devel >= %{?with_glesv2:1.1}%{!?with_glesv2:1.0}
@@ -90,6 +91,7 @@ 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: aom-devel
 BuildRequires: aribb24-devel >= 1.0.1
 BuildRequires: aribb25-devel >= 0.2.6
 BuildRequires: asdcplib-devel
@@ -348,6 +350,7 @@ Akcje klienta VLC dla Solid.
 %endif
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -374,6 +377,7 @@ Akcje klienta VLC dla Solid.
 %endif
        --enable-aa%{!?with_aalib:=no} \
        %{?with_alsa:--enable-alsa} \
+       --enable-aom \
        --enable-avcodec \
        %{!?with_bonjour:--disable-bonjour} \
        --enable-caca%{!?with_caca:=no} \
@@ -648,6 +652,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/vlc/plugins/codec
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/liba52_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libaes3_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libaom_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