[vlc] Fix build with x264 >= 0.153

commit 83fac7aa45332d60ba70aa3e377791ec2ba58a54 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Fri Oct 5 00:05:30 2018 +0100 Fix build with x264 >= 0.153 vlc.spec | 2 ++ x264-Fix-build-with-a-newer-version-of-x264.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) --- diff --git a/vlc.spec b/vlc.spec index 34ef0af..d78d2c9 100644 --- a/vlc.spec +++ b/vlc.spec @@ -47,6 +47,7 @@ Release: 3%{?dist} License: GPLv2+ URL: https://www.videolan.org Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz +Patch1: x264-Fix-build-with-a-newer-version-of-x264.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -582,6 +583,7 @@ fi || : %changelog * Thu Oct 04 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 3.0.5-3 - Mass rebuild for x264 and/or x265 +- Fix build with x264 >= 0.153 * Wed Oct 03 2018 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.0.5-2 - Update to 20181003 snapshot diff --git a/x264-Fix-build-with-a-newer-version-of-x264.patch b/x264-Fix-build-with-a-newer-version-of-x264.patch new file mode 100644 index 0000000..aa774a9 --- /dev/null +++ b/x264-Fix-build-with-a-newer-version-of-x264.patch @@ -0,0 +1,13 @@ +diff --git a/modules/codec/x264.c b/modules/codec/x264.c +index e02048f075..dec95a9c78 100644 +--- a/modules/codec/x264.c ++++ b/modules/codec/x264.c +@@ -842,7 +842,7 @@ static int Open ( vlc_object_t *p_this ) + fullrange |= p_enc->fmt_in.video.b_color_range_full; + p_enc->fmt_in.i_codec = fullrange ? VLC_CODEC_J420 : VLC_CODEC_I420; + p_sys->i_colorspace = X264_CSP_I420; +-#if X264_BUILD >= 118 ++#if X264_BUILD >= 118 && X264_BUILD < 153 + char *psz_profile = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" ); + if( psz_profile ) + {