commit 0f03be2c872cdc6d36992f83dae4b4c3df1e3574 Author: Martin Gansser <mgansser(a)alice.de&gt; Date: Tue Jun 28 22:32:27 2016 +0200 Added ffmpeg_2.9.patch .gitignore | 2 ++ sources | 3 ++- vdr-softhddevice.spec | 21 +++++++++++++++------ 3 files changed, 19 insertions(+), 7 deletions(-) --- diff --git a/.gitignore b/.gitignore index 6412d5e..7859139 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ vdr-plugin-softhddevice-ee2311d25237b9828c1423505e5d4055a836414d.tar.bz2 +/ffmpeg_2.9.patch +/vdr-plugin-softhddevice-6dfa88aecf1b5a4c5932ba278209d9f22676547f.tar.bz2 diff --git a/sources b/sources index 5ebf80e..5f0d562 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -4ee178a5210d007fc5abf6a7ae99f5e6 vdr-plugin-softhddevice-ee2311d25237b9828c1423505e5d4055a836414d.tar.bz2 +9cde64c6b542ced6f0418382f2c225b5 ffmpeg_2.9.patch +4f6ff23660aba7909318c583770812ea vdr-plugin-softhddevice-6dfa88aecf1b5a4c5932ba278209d9f22676547f.tar.bz2 diff --git a/vdr-softhddevice.spec b/vdr-softhddevice.spec index 63bfb3c..0e7819b 100644 --- a/vdr-softhddevice.spec +++ b/vdr-softhddevice.spec @@ -1,21 +1,23 @@ -%global commit ee2311d25237b9828c1423505e5d4055a836414d -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global gitdate 20151006 +%global commit0 6dfa88aecf1b5a4c5932ba278209d9f22676547f +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global gitdate 20151103 Name: vdr-softhddevice Version: 0.6.1 -Release: 7.%{gitdate}git%{shortcommit}%{?dist} +Release: 9.%{gitdate}git%{shortcommit0}%{?dist} Summary: A software and GPU emulated HD output device plugin for VDR License: AGPLv3 URL: http://projects.vdr-developer.org/projects/plg-softhddevice -Source0: http://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git/snapsho... +Source0: http://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git/snapsho... # Configuration files for plugin parameters. These are Fedora specific and not in upstream. Source1: %{name}.conf # http://projects.vdr-developer.org/issues/1417 Patch0: exit-crash.patch # http://projects.vdr-developer.org/issues/1916 Patch1: chartype.patch +# https://projects.vdr-developer.org/issues/2424 +Patch2: ffmpeg_2.9.patch BuildRequires: vdr-devel >= 1.7.22 BuildRequires: gettext @@ -52,9 +54,10 @@ A software and GPU emulated HD output device plugin for VDR. %prep -%setup -qn vdr-plugin-softhddevice-%{commit} +%setup -qn vdr-plugin-softhddevice-%{commit0} %patch0 -p1 %patch1 -p0 +%patch2 -p1 # remove .git files and Gentoo files rm -f .indent.pro .gitignore .gitattributes @@ -82,6 +85,12 @@ install -Dpm 644 %{SOURCE1} \ %license AGPL-3.0.txt %changelog +* Tue Jun 28 2016 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 0.6.1-9.20151103git6dfa88a +- Added ffmpeg_2.9.patch + +* Wed Nov 04 2015 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 0.6.1-8.20151103git6dfa88a +- update for new git snapshot + * Wed Oct 07 2015 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 0.6.1-7.20151006gitee2311d - update for new git snapshot