commit f69e72544be8ebd4afc3d02242d6836b5a9c63a5 Author: Martin Gansser <mgansser(a)online.de&gt; Date: Wed May 26 11:21:39 2021 +0200 Use fork because its under maintenance .gitignore | 1 + sources | 2 +- vdr-mp3-0.10.1-no-debug.patch | 14 ---- vdr-mp3-0.10.2-fsf-fix.patch | 20 ----- ...Makefile.patch => vdr-mp3-0.10.4-Makefile.patch | 4 +- vdr-mp3-fix-C++11-warning.patch | 31 ------- vdr-mp3-mplayer.sh-0.8.7-defaults.patch | 96 ---------------------- vdr-mp3-mplayer.sh-0.8.7-lircrc.patch | 15 ---- vdr-mp3-mplayer.sh-framedrop.patch | 11 --- vdr-mp3-mplayer.sh-identify.patch | 11 --- vdr-mp3-vdr2.1.2-compat.patch | 28 ------- vdr-mp3.spec | 40 +++------ 12 files changed, 17 insertions(+), 256 deletions(-) --- diff --git a/.gitignore b/.gitignore index c064e01..75b243c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ mplayer.sh-0.8.7.tar.gz vdr-mp3-0.10.2.tar.gz +/vdr-mp3-0.10.4.tar.gz diff --git a/sources b/sources index c989a16..f331349 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (mplayer.sh-0.8.7.tar.gz) = 5e83dd2f83b104f7043d828b713e34f47c9a42a93324424c802d4d448b770e36515accf67bd67ce7461201b5e9cd5596da2bbd182eccef9578c9b31b5fed50d9 -SHA512 (vdr-mp3-0.10.2.tar.gz) = 8f65d9f41643266137fcc950d0da66ef9c4ce5dff82828c88230cda9d8ef4f7e39d096557d69bf124a287496276508dc9464c0868b4cbef9059de1108cd35f40 +SHA512 (vdr-mp3-0.10.4.tar.gz) = 729a50c3be898a5560655ee9e4371bff98c877bd34c1b4f96d4ea2ec647a7fd0657a180d4c8e0433913a44f3c7d590a242eb5585be6f44604e741bd69ed6065c diff --git a/vdr-mp3-0.10.2-Makefile.patch b/vdr-mp3-0.10.4-Makefile.patch similarity index 92% rename from vdr-mp3-0.10.2-Makefile.patch rename to vdr-mp3-0.10.4-Makefile.patch index 56257ad..1ab8c58 100644 --- a/vdr-mp3-0.10.2-Makefile.patch +++ b/vdr-mp3-0.10.4-Makefile.patch @@ -1,5 +1,5 @@ ---- mp3-0.10.2/Makefile.orig 2012-05-11 23:41:20.963758554 +0200 -+++ mp3-0.10.2/Makefile 2012-05-11 23:37:45.748768802 +0200 +--- vdr-plugin-mp3-0.10.4/Makefile.orig 2021-05-26 10:48:07.383248811 +0200 ++++ vdr-plugin-mp3-0.10.4/Makefile 2021-05-26 10:51:34.028257791 +0200 @@ -80,13 +80,13 @@ ### The version number of VDR (taken from VDR's "config.h"): diff --git a/vdr-mp3.spec b/vdr-mp3.spec index 1cbc8f3..f4630f5 100644 --- a/vdr-mp3.spec +++ b/vdr-mp3.spec @@ -4,28 +4,20 @@ # - audio CD support? Name: vdr-mp3 -Version: 0.10.2 -Release: 30%{?dist} +Version: 0.10.4 +Release: 1%{?dist} Summary: Sound playback plugin for VDR License: GPLv2+ -URL: http://www.muempf.de/ -Source0: http://www.muempf.de/down/%{name}-%{version}.tar.gz -Source1: http://batleth.sapienti-sat.org/projects/VDR/versions/mplayer.sh-0.8.7.ta... +URL: https://github.com/vdr-projects/vdr-plugin-mp3/ +Source0: https://github.com/vdr-projects/vdr-plugin-mp3/archive/refs/tags/%{versio... +Source1: http://batleth.sapienti-sat.org/projects/VDR/versions/mplayer.sh-0.8.7.ta... Source2: %{name}-mediasources.sh Source3: %{name}-mp3.conf Source4: %{name}-mplayer.conf Source5: %{name}-mplayer-minimal.sh Source6: %{name}-mp3sources.conf -Patch0: %{name}-mplayer.sh-0.8.7-lircrc.patch -Patch1: %{name}-mplayer.sh-framedrop.patch -Patch2: %{name}-mplayer.sh-identify.patch -Patch3: %{name}-mplayer.sh-0.8.7-defaults.patch -Patch4: %{name}-0.10.1-no-debug.patch -Patch5: %{name}-0.10.2-Makefile.patch -Patch6: %{name}-0.10.2-fsf-fix.patch -Patch7: %{name}-vdr2.1.2-compat.patch -Patch8: %{name}-fix-overloaded-ambiguous.patch -Patch9: %{name}-fix-C++11-warning.patch +Patch0: %{name}-%{version}-Makefile.patch +Patch1: %{name}-fix-overloaded-ambiguous.patch BuildRequires: gcc-c++ BuildRequires: vdr-devel >= 2.0.6 @@ -57,17 +49,9 @@ primary output device. %prep -%setup -q -n mp3-%{version} -a 1 -%patch0 -%patch1 -%patch2 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 +%setup -q -n vdr-plugin-mp3-%{version} -a 1 +%patch0 -p1 +%patch1 -p1 %{__perl} -pi -e \ 's|CFGFIL=.*|CFGFIL="%{vdr_configdir}/plugins/mplayer.sh.conf"|' \ mplayer.sh @@ -177,8 +161,10 @@ fi %defattr(-,%{vdr_user},root,-) %ghost %{vdr_vardir}/global.mplayer.resume - %changelog +* Wed May 26 2021 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 0.10.4-1 +- Use fork because its under maintenance + * Fri Apr 30 2021 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 0.10.2-30 - Rebuilt for new VDR API version