commit 139a366ebea01b972ea506c0c845c9e3fbf4e7f4 Author: Martin Gansser <mgansser(a)online.de&gt; Date: Mon Jan 4 13:10:58 2021 +0100 Rebuilt for new VDR API version Add vdr-mp3-fix-C++11-warning.patch that fixes: vdr-mp3-fix-C++11-warning.patch | 31 +++++++++++++++++++++++++++++++ vdr-mp3.spec | 3 +++ 2 files changed, 34 insertions(+) --- diff --git a/vdr-mp3-fix-C++11-warning.patch b/vdr-mp3-fix-C++11-warning.patch new file mode 100644 index 0000000..f78073f --- /dev/null +++ b/vdr-mp3-fix-C++11-warning.patch @@ -0,0 +1,31 @@ +--- mp3-0.10.2/data-mp3.c.orig 2021-01-04 11:50:54.614365552 +0100 ++++ mp3-0.10.2/data-mp3.c 2021-01-04 11:58:56.790633754 +0100 +@@ -43,7 +43,7 @@ + // image suffixes to search + const char *img_suff[] = { "jpg","png","gif",0 }; + // exclude list for instant playlist creation +-const char *excl_pl[] = { "*"PLAYLISTEXT,"*.jpg","*.gif","*.png",0 }; ++const char *excl_pl[] = { "*" PLAYLISTEXT,"*.jpg","*.gif","*.png",0 }; + // exclude list for song browser + const char *excl_br[] = { ".*","*.jpg","*.gif","*.png",0 }; + +@@ -550,7 +550,7 @@ + + bool cPlayLists::Load(cFileSource *Source) + { +- static const char *spec[] = { "*"PLAYLISTEXT,0 }; ++ static const char *spec[] = { "*" PLAYLISTEXT,0 }; + Clear(); + bool res=ScanDir(Source,0,stFile,spec,0,false); + Sort(); +--- mp3-0.10.2/data-mp3.c.orig 2021-01-04 12:49:18.870762858 +0100 ++++ mp3-0.10.2/data-mp3.c 2021-01-04 12:50:19.619315257 +0100 +@@ -409,7 +409,7 @@ + if(f) { + char buffer[512]; + result=true; +- while(fgets(buffer,sizeof(buffer),f)>0) { ++ while(fgets(buffer,sizeof(buffer),f)!=0) { + if(buffer[0]=='#') { + if(!strncmp(buffer,WINAMPEXT,strlen(WINAMPEXT))) { + d(printf("mp3: detected WinAmp style playlist\n")) diff --git a/vdr-mp3.spec b/vdr-mp3.spec index 40c90b4..173c8d6 100644 --- a/vdr-mp3.spec +++ b/vdr-mp3.spec @@ -25,6 +25,7 @@ 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 BuildRequires: gcc-c++ BuildRequires: vdr-devel >= 2.0.6 @@ -66,6 +67,7 @@ primary output device. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %{__perl} -pi -e \ 's|CFGFIL=.*|CFGFIL="%{vdr_configdir}/plugins/mplayer.sh.conf"|' \ mplayer.sh @@ -179,6 +181,7 @@ fi %changelog * Mon Jan 04 2021 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 0.10.2-28 - Rebuilt for new VDR API version +- Add vdr-mp3-fix-C++11-warning.patch that fixes: * Wed Oct 21 2020 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 0.10.2-27 - Rebuilt for new VDR API version