From 7eafeaa7b630a9c1d1fea60da473e33f3cea0b6e Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: Fri, 6 Mar 2020 10:31:47 +0000
Subject: [PATCH] Fix f30 build with old dav1d

---
 buildfix_for_old_dav1d.patch | 30 ++++++++++++++++++++++++++++++
 vlc.spec                     |  6 ++++++
 2 files changed, 36 insertions(+)
 create mode 100644 buildfix_for_old_dav1d.patch

diff --git a/buildfix_for_old_dav1d.patch b/buildfix_for_old_dav1d.patch
new file mode 100644
index 0000000..ab484ff
--- /dev/null
+++ b/buildfix_for_old_dav1d.patch
@@ -0,0 +1,30 @@
+--- a/modules/codec/dav1d.c
++++ b/modules/codec/dav1d.c
+@@ -223,7 +223,7 @@
+         if( p_data )
+         {
+             res = dav1d_send_data(p_sys->c, p_data);
+-            if (res < 0 && res != DAV1D_ERR(EAGAIN))
++            if (res < 0 && res != -EAGAIN)
+             {
+                 msg_Err(dec, "Decoder feed error %d!", res);
+                 i_ret = VLC_EGENERIC;
+@@ -248,15 +248,14 @@
+             decoder_QueueVideo(dec, pic);
+             dav1d_picture_unref(&img);
+         }
+-        else if (res != DAV1D_ERR(EAGAIN))
++        else if (res != -EAGAIN)
+         {
+             msg_Warn(dec, "Decoder error %d!", res);
+             break;
+         }
+ 
+         /* on drain, we must ignore the 1st EAGAIN */
+-        if(!b_draining && (res == DAV1D_ERR(EAGAIN) || res == 0)
+-                       && (p_data == NULL||b_eos))
++        if(!b_draining && (res == -EAGAIN || res == 0) && (p_data == NULL||b_eos))
+         {
+             b_draining = true;
+             res = 0;
+
diff --git a/vlc.spec b/vlc.spec
index b9410ca..825572c 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -62,6 +62,9 @@ Patch0:		https://github.com/RPi-Distro/vlc/raw/buster-rpt/debian/patches/mmal_16
 Patch1:     libplacebo_patch_1.patch
 Patch2:     Fix_aom_abi_break.patch 
 Patch3:     0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch
+# Revert commit for f30
+# https://git.videolan.org/?p=vlc/vlc-3.0.git;a=commitdiff;h=bb98c9a1bda8972a83ec102e286da00228c1f2d3
+Patch4:     buildfix_for_old_dav1d.patch
 BuildRequires:	desktop-file-utils
 BuildRequires:  libappstream-glib
 BuildRequires:  fontpackages-devel
@@ -304,6 +307,9 @@ VLC media player extras modules.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%if 0%{?fedora} == 30
+%patch4 -p1
+%endif
 
 %if 0%{?rhel} == 7
 . /opt/rh/devtoolset-7/enable