Fix f30 build with old dav1d

el8
leigh123linux 5 years ago
parent ee6b5e1d4b
commit 7eafeaa7b6

@ -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;

@ -62,6 +62,9 @@ Patch0: https://github.com/RPi-Distro/vlc/raw/buster-rpt/debian/patches/mmal_16
Patch1: libplacebo_patch_1.patch Patch1: libplacebo_patch_1.patch
Patch2: Fix_aom_abi_break.patch Patch2: Fix_aom_abi_break.patch
Patch3: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.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: desktop-file-utils
BuildRequires: libappstream-glib BuildRequires: libappstream-glib
BuildRequires: fontpackages-devel BuildRequires: fontpackages-devel
@ -304,6 +307,9 @@ VLC media player extras modules.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%if 0%{?fedora} == 30
%patch4 -p1
%endif
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
. /opt/rh/devtoolset-7/enable . /opt/rh/devtoolset-7/enable

Loading…
Cancel
Save