[lives] Rename patch for ffmpeg-3.5 and applied on fedora 28+

commit 67467e11a857760a3a63538f4df8cf6f9ed07af9 Author: sagitter <sagitter(a)fedoraproject.org&gt; Date: Sat Jan 20 11:44:03 2018 +0100 Rename patch for ffmpeg-3.5 and applied on fedora 28+ ffmpeg35_buildfix.patch => lives-ffmpeg35_buildfix.patch | 4 ++-- lives.spec | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) --- diff --git a/ffmpeg35_buildfix.patch b/lives-ffmpeg35_buildfix.patch similarity index 98% rename from ffmpeg35_buildfix.patch rename to lives-ffmpeg35_buildfix.patch index 9be72a1..6beefb5 100644 --- a/ffmpeg35_buildfix.patch +++ b/lives-ffmpeg35_buildfix.patch @@ -184,7 +184,7 @@ get_samps_and_signed(cc->sample_fmt, &cdata->asamps, &cdata->asigned); - sprintf(cdata->audio_name, "%s", cc->codec_name); -+ sprintf(cdata->audio_name, "%s", avcodec_get_name(cc->codec_id)); ++ sprintf(cdata->audio_name, "%s", cc->codec_type); priv->astream = i; break; @@ -193,7 +193,7 @@ } - sprintf(cdata->video_name, "%s", cc->codec_name); -+ sprintf(cdata->video_name, "%s", avcodec_get_name(cc->codec_id)); ++ sprintf(cdata->video_name, "%s", cc->codec_type); cdata->par = cc->sample_aspect_ratio.num / cc->sample_aspect_ratio.den; if (cdata->par == 0) cdata->par = 1; diff --git a/lives.spec b/lives.spec index 9b6d0f3..256313c 100644 --- a/lives.spec +++ b/lives.spec @@ -13,14 +13,14 @@ Name: lives Version: 2.8.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Video editor and VJ tool License: GPLv3+ and LGPLv3+ URL: http://lives-video.com Source0: http://lives-video.com/releases/LiVES-%{version}.tar.bz2 ## Appdata file Source1: LiVES.appdata.xml -Patch0: ffmpeg35_buildfix.patch +Patch0: %{name}-ffmpeg35_buildfix.patch BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(sdl) @@ -45,6 +45,7 @@ BuildRequires: pkgconfig(fftw3) #BuildRequires: pkgconfig(libvisual-0.4) BuildRequires: pkgconfig(libmatroska) BuildRequires: pkgconfig(mjpegtools) +BuildRequires: pkgconfig(libprojectM) BuildRequires: ladspa-devel BuildRequires: x264-libs BuildRequires: gettext-devel @@ -60,7 +61,6 @@ BuildRequires: gcc-c++ BuildRequires: perl-generators BuildRequires: python2-devel BuildRequires: python3-devel -BuildRequires: libprojectM-devel # Packages for re-configuration BuildRequires: autoconf, automake, libtool @@ -94,7 +94,9 @@ It is small in size, yet it has many advanced features. %prep %setup -q -n lives-%{version} +%if 0%{?fedora} > 27 %patch0 -p1 +%endif ##Remove spurious executable permissions for i in `find . -type f \( -name "*.c" -o -name "*.h" -o -name "*.txt" \)`; do @@ -104,7 +106,7 @@ done %build %configure --disable-silent-rules --enable-shared --enable-static \ --enable-largefile --enable-threads --disable-rpath --enable-profiling \ - --enable-doxygen + --enable-doxygen --disable-libvisual --enable-projectM %make_build CPPFLAGS=-I%{_includedir}/tirpc LIBS="-ltirpc -ldl" @@ -187,6 +189,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/appdata/LiVES.appdata.xml %changelog +* Sat Jan 20 2018 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 2.8.7.9 +- Rename patch for ffmpeg-3.5 and applied on fedora 28+ + * Sat Jan 20 2018 Meu Nome <eu(a)exemplo.com&gt; - 2.8.7-8 - Enable libprojectM