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 234B8138359 for ; Sun, 1 Nov 2020 05:28:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46C84E0830; Sun, 1 Nov 2020 05:28:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2EEE9E0830 for ; Sun, 1 Nov 2020 05:28:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 D4371340BDA for ; Sun, 1 Nov 2020 05:28:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 59EEA38A for ; Sun, 1 Nov 2020 05:28:13 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1604208235.8cc02afe349792cc39e886d9ee01f8bf501548cc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ccextractor/, media-video/ccextractor/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/ccextractor/ccextractor-0.85-r2.ebuild media-video/ccextractor/files/ccextractor-0.85-fno-common.patch X-VCS-Directories: media-video/ccextractor/files/ media-video/ccextractor/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8cc02afe349792cc39e886d9ee01f8bf501548cc X-VCS-Branch: master Date: Sun, 1 Nov 2020 05:28:13 +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: 56688cd7-0644-4f83-bef7-c53210c50b79 X-Archives-Hash: 3805a11ca8abdd119a7b9f7863b7136d commit: 8cc02afe349792cc39e886d9ee01f8bf501548cc Author: Sam James gentoo org> AuthorDate: Sun Nov 1 05:23:55 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sun Nov 1 05:23:55 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cc02afe media-video/ccextractor: fix build with gcc 10 Thanks-to: Matt Whitlock mattwhitlock.name> Closes: https://bugs.gentoo.org/706934 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> media-video/ccextractor/ccextractor-0.85-r2.ebuild | 26 +++++++++++----------- .../files/ccextractor-0.85-fno-common.patch | 13 +++++++++++ 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/media-video/ccextractor/ccextractor-0.85-r2.ebuild b/media-video/ccextractor/ccextractor-0.85-r2.ebuild index b7f0cdfe882..982bba8df30 100644 --- a/media-video/ccextractor/ccextractor-0.85-r2.ebuild +++ b/media-video/ccextractor/ccextractor-0.85-r2.ebuild @@ -1,32 +1,32 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils toolchain-funcs +inherit cmake DESCRIPTION="Extract closed captioning subtitles from video to SRT" HOMEPAGE="https://www.ccextractor.org/" SRC_URI="mirror://sourceforge/ccextractor/${PN}-src-nowin.${PV}.zip" +S="${WORKDIR}/${PN}/src" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" +BDEPEND="app-arch/unzip + virtual/pkgconfig" RDEPEND=" media-libs/libpng:0= - sys-libs/zlib:= -" -DEPEND="${RDEPEND} - app-arch/unzip - virtual/pkgconfig" - -S="${WORKDIR}/${PN}/src" + sys-libs/zlib:=" +DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${PN}-0.85-fno-common.patch" +) src_install() { - cmake-utils_src_install + cmake_src_install dodoc ../docs/*.TXT } diff --git a/media-video/ccextractor/files/ccextractor-0.85-fno-common.patch b/media-video/ccextractor/files/ccextractor-0.85-fno-common.patch new file mode 100644 index 00000000000..6e543f74910 --- /dev/null +++ b/media-video/ccextractor/files/ccextractor-0.85-fno-common.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/706934 +--- a/lib_ccx/ccx_decoders_708.h ++++ b/lib_ccx/ccx_decoders_708.h +@@ -368,7 +368,7 @@ + unsigned char *data, + int data_length); + +-ccx_dtvcc_pen_color ccx_dtvcc_default_pen_color; +-ccx_dtvcc_pen_attribs ccx_dtvcc_default_pen_attribs; ++extern ccx_dtvcc_pen_color ccx_dtvcc_default_pen_color; ++extern ccx_dtvcc_pen_attribs ccx_dtvcc_default_pen_attribs; + + #endif