diff options
Diffstat (limited to 'media-plugins/vdr-mplayer')
| -rw-r--r-- | media-plugins/vdr-mplayer/Manifest | 3 | ||||
| -rw-r--r-- | media-plugins/vdr-mplayer/files/vdr-mplayer-0.10.2_tc-directly.patch | 52 | ||||
| -rw-r--r-- | media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r1.ebuild (renamed from media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild) | 7 |
3 files changed, 59 insertions, 3 deletions
diff --git a/media-plugins/vdr-mplayer/Manifest b/media-plugins/vdr-mplayer/Manifest index a36b3cc46121..c92b3edb72bc 100644 --- a/media-plugins/vdr-mplayer/Manifest +++ b/media-plugins/vdr-mplayer/Manifest @@ -2,6 +2,7 @@ AUX 0.10.2/01_gentoo.diff 1327 BLAKE2B a883a2d10693c67bb112320599ab490b07862ce90 AUX confd-0.9.15.sh 278 BLAKE2B 8ed6289118a5e6d072b7696409d02adc3bd5472eeb62e50695884f66cb9c8e471c301be304e12f7f7c328257ea2ce1c2ff765b0effb0053e0e30fa43a1ec685e SHA512 62e93ce4fcdc5ae47722136d41c30524fb87fd53c46468ff808cc78e336850c7915da35504e1d41506c33a56188b2bc3b8fd9d9e14860b1aa690785f7a7d7f2b AUX mplayersources.conf 55 BLAKE2B 5c035fb8f8347f8544f23e88ebd8003e12071fdce4e1e8f91d9117c6d5d0509f545c0f41dd4f22516d14fa0484aad70e3ea239a687a499081df05f09f27cf93b SHA512 ea34849de161dd0bbff67fc10b28e0f13fc4a9b05f34187782ee49e030b19be4e9dadd7eb9e3a444c431fc6bfc0ac64002a5b860ef62810bcc0f1b0949767395 AUX rc-addon-0.9.15.sh 529 BLAKE2B ba056ce8fd1b2f543b791f613e8d129e3ce6dafd47039ca6a4dbe746622bcabbf81a05f7bfab168768abbec70af35ee84d905d9010bc49b11d6b4e039375a3fd SHA512 0a8861634e0bd2f1778f62fb3c9a0ba2ec41561fd755d022cdce18ca65a6429fce97f5d87df1ee536a1bb5cac518ecb2f5e7c5fe63d591208f84c3f192d622e9 +AUX vdr-mplayer-0.10.2_tc-directly.patch 1762 BLAKE2B fef91edc1c7d0705521985616589eba685b04aa7d1fb4f0a080fbd919c0cf97824a59cbfef7eb89e40c4c88164c9d741cc5c567f5226c1f8af26a95955cf949d SHA512 923f8c0adb9e9f0e8cd1a00160afa11b46480133016d9f43dfbf6cbb96d7be284aaae72a9f5e88c6baac095374164d3404ecf01513e9e8bc899bfaddeb7ce679 DIST vdr-mp3-0.10.2.tar.gz 131512 BLAKE2B 12f6e0ff495a9349a7bebb323a68216a203470cb9020ab62a72d09d2072797069418dd1e55fe6e827c9e8e4b65e521a33090293a69b37ef02c85047735e55127 SHA512 8f65d9f41643266137fcc950d0da66ef9c4ce5dff82828c88230cda9d8ef4f7e39d096557d69bf124a287496276508dc9464c0868b4cbef9059de1108cd35f40 -EBUILD vdr-mplayer-0.10.2.ebuild 1514 BLAKE2B 5843faf81978a37095328c9c248673c1e19ac27d6d630b32d9aa32b096646964d350b2b3915a90fad78a1f2a9d7b4e73a00a9c35c4b6aec4dcf061f7a6452f38 SHA512 30005bb7b026e8fa0897cfc84404df77eb95d1cefcb2e27368c4b4d731728dfaa52bc97d85d62a340898910fbef6f75b769b8ef30ae1b39e3413d30a130bf049 +EBUILD vdr-mplayer-0.10.2-r1.ebuild 1571 BLAKE2B 040832b650249bde7a53a82693466fa7b73a7f29bd2f3834c309f005399a6eb6b2e95c4b415b07e332fb6a97b3a59a2ffccc171cb5c56a92ee96c077bb4177ee SHA512 98e44fe3646123d0aaedb037644fd3ba2639cf6f6609cf6fcfbcccc1d9dd598990b3d18aebb9b5b1556d100b0c90209e0b5255e2693b242783c125ee1b90854a MISC metadata.xml 500 BLAKE2B c4eaf4b1bf8d9229a66f27e50919754ce48a9fafdd3fc359bb665bfa9832941e08052cd8805bb4cfda8fa647d3037717973770633f55dc7e296301545a69f0b2 SHA512 eb4b8eff7911b1eb110d1ea98d9c55a66460a1168896451116b225c91393ec9891c5fc6882328638e5520f7e66ed278291af707cbc13d3b2d9198f47cc630beb diff --git a/media-plugins/vdr-mplayer/files/vdr-mplayer-0.10.2_tc-directly.patch b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.10.2_tc-directly.patch new file mode 100644 index 000000000000..67a97c7f6ac9 --- /dev/null +++ b/media-plugins/vdr-mplayer/files/vdr-mplayer-0.10.2_tc-directly.patch @@ -0,0 +1,52 @@ +https://bugs.gentoo.org/787557 + +fixed call g++ directly fixed +some minor clang warnings fixed + +Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (02 Mar 2021) +diff -Naur mp3-0.10.2.orig/Makefile mp3-0.10.2/Makefile +--- mp3-0.10.2.orig/Makefile 2021-05-02 16:13:39.489653108 +0200 ++++ mp3-0.10.2/Makefile 2021-05-02 16:13:55.695653108 +0200 +@@ -179,7 +179,7 @@ + + # Dependencies: + +-MAKEDEP = g++ -MM -MG ++MAKEDEP = $(CXX) -MM -MG + DEPFILE = .dependencies + DEPFILES = $(subst i18n.c,,$(subst version.c,,$(OBJS:%.o=%.c) $(OBJS2:%.o=%.c))) + $(DEPFILE): Makefile $(DEPFILES) $(wildcard *.h) +diff -Naur mp3-0.10.2.orig/data-mp3.c mp3-0.10.2/data-mp3.c +--- mp3-0.10.2.orig/data-mp3.c 2021-05-02 16:13:39.490653108 +0200 ++++ mp3-0.10.2/data-mp3.c 2021-05-02 16:14:18.543653108 +0200 +@@ -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(); +diff -Naur mp3-0.10.2.orig/data.c mp3-0.10.2/data.c +--- mp3-0.10.2.orig/data.c 2021-05-02 16:13:39.490653108 +0200 ++++ mp3-0.10.2/data.c 2021-05-02 16:14:27.279653108 +0200 +@@ -89,7 +89,8 @@ + va_list ap; + va_start(ap,fmt); + char *str=0; +- if(vasprintf(&str,fmt,ap)<0); ++ if(vasprintf(&str,fmt,ap)<0) ++ ; + va_end(ap); + return str; + } diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r1.ebuild index 9dc275850266..9f8ce981fa05 100644 --- a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild +++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit vdr-plugin-2 @@ -35,6 +35,9 @@ src_prepare() { -i decoder.c \ -i player-mplayer.c fi + + # bug 787557 + eapply "${FILESDIR}/${P}_tc-directly.patch" } src_install() { |