From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A071C1382C5 for ; Sun, 2 May 2021 16:36:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0C56E0896; Sun, 2 May 2021 16:36:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D16D3E0896 for ; Sun, 2 May 2021 16:36:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 41C47340C7B for ; Sun, 2 May 2021 16:36:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 081CA643 for ; Sun, 2 May 2021 16:36:29 +0000 (UTC) From: "Jörg Bornkessel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jörg Bornkessel" Message-ID: <1619973379.6c5374319debcf20472f938d7c3e55fa2d2ea742.hd_brummy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-mplayer/files/, media-plugins/vdr-mplayer/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/vdr-mplayer/files/vdr-mplayer-0.10.2_tc-directly.patch media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r1.ebuild media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild X-VCS-Directories: media-plugins/vdr-mplayer/ media-plugins/vdr-mplayer/files/ X-VCS-Committer: hd_brummy X-VCS-Committer-Name: Jörg Bornkessel X-VCS-Revision: 6c5374319debcf20472f938d7c3e55fa2d2ea742 X-VCS-Branch: master Date: Sun, 2 May 2021 16:36:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7383edbd-e8bb-48d6-a8a9-d6c4e49417d8 X-Archives-Hash: 462c1c3530f4fd659b61f53ed4bc8786 commit: 6c5374319debcf20472f938d7c3e55fa2d2ea742 Author: Joerg Bornkessel gentoo org> AuthorDate: Sun May 2 16:35:09 2021 +0000 Commit: Jörg Bornkessel gentoo org> CommitDate: Sun May 2 16:36:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c537431 media-plugins/vdr-mplayer: tc-directly call fixed some minor clang warnings fixed Closes: https://bugs.gentoo.org/787557 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Joerg Bornkessel gentoo.org> .../files/vdr-mplayer-0.10.2_tc-directly.patch | 52 ++++++++++++++++++++++ ...-0.10.2.ebuild => vdr-mplayer-0.10.2-r1.ebuild} | 3 ++ 2 files changed, 55 insertions(+) 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 00000000000..67a97c7f6ac --- /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 (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 similarity index 96% rename from media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild rename to media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r1.ebuild index 306995560a5..9f8ce981fa0 100644 --- a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2.ebuild +++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r1.ebuild @@ -35,6 +35,9 @@ src_prepare() { -i decoder.c \ -i player-mplayer.c fi + + # bug 787557 + eapply "${FILESDIR}/${P}_tc-directly.patch" } src_install() {