diff options
| author |   Sam James <sam@gentoo.org> | 2020-11-01 05:23:55 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2020-11-01 05:23:55 +0000 |
| commit | 8cc02afe349792cc39e886d9ee01f8bf501548cc (patch) | |
| tree | 837a106ef442318a1dfd4fcdb0ba6164f35d70d9 | |
| parent | app-editors/dav: fix build with gcc 10, compressed man (diff) | |
| download | gentoo-8cc02afe.tar.gz gentoo-8cc02afe.tar.bz2 gentoo-8cc02afe.zip | |
media-video/ccextractor: fix build with gcc 10
Thanks-to: Matt Whitlock <gentoo@mattwhitlock.name>
Closes: https://bugs.gentoo.org/706934
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | media-video/ccextractor/ccextractor-0.85-r2.ebuild | 26 | ||||
| -rw-r--r-- | media-video/ccextractor/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 b7f0cdfe8825..982bba8df303 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 000000000000..6e543f74910a --- /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 |