| 1 |
commit: 8cc02afe349792cc39e886d9ee01f8bf501548cc |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 1 05:23:55 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 1 05:23:55 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cc02afe |
| 7 |
|
| 8 |
media-video/ccextractor: fix build with gcc 10 |
| 9 |
|
| 10 |
Thanks-to: Matt Whitlock <gentoo <AT> mattwhitlock.name> |
| 11 |
Closes: https://bugs.gentoo.org/706934 |
| 12 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
media-video/ccextractor/ccextractor-0.85-r2.ebuild | 26 +++++++++++----------- |
| 16 |
.../files/ccextractor-0.85-fno-common.patch | 13 +++++++++++ |
| 17 |
2 files changed, 26 insertions(+), 13 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-video/ccextractor/ccextractor-0.85-r2.ebuild b/media-video/ccextractor/ccextractor-0.85-r2.ebuild |
| 20 |
index b7f0cdfe882..982bba8df30 100644 |
| 21 |
--- a/media-video/ccextractor/ccextractor-0.85-r2.ebuild |
| 22 |
+++ b/media-video/ccextractor/ccextractor-0.85-r2.ebuild |
| 23 |
@@ -1,32 +1,32 @@ |
| 24 |
-# Copyright 1999-2019 Gentoo Authors |
| 25 |
+# Copyright 1999-2020 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
-EAPI=6 |
| 29 |
+EAPI=7 |
| 30 |
|
| 31 |
-inherit cmake-utils toolchain-funcs |
| 32 |
+inherit cmake |
| 33 |
|
| 34 |
DESCRIPTION="Extract closed captioning subtitles from video to SRT" |
| 35 |
HOMEPAGE="https://www.ccextractor.org/" |
| 36 |
SRC_URI="mirror://sourceforge/ccextractor/${PN}-src-nowin.${PV}.zip" |
| 37 |
+S="${WORKDIR}/${PN}/src" |
| 38 |
|
| 39 |
LICENSE="GPL-2" |
| 40 |
SLOT="0" |
| 41 |
KEYWORDS="amd64 x86" |
| 42 |
-IUSE="" |
| 43 |
|
| 44 |
+BDEPEND="app-arch/unzip |
| 45 |
+ virtual/pkgconfig" |
| 46 |
RDEPEND=" |
| 47 |
media-libs/libpng:0= |
| 48 |
- sys-libs/zlib:= |
| 49 |
-" |
| 50 |
-DEPEND="${RDEPEND} |
| 51 |
- app-arch/unzip |
| 52 |
- virtual/pkgconfig" |
| 53 |
- |
| 54 |
-S="${WORKDIR}/${PN}/src" |
| 55 |
+ sys-libs/zlib:=" |
| 56 |
+DEPEND="${RDEPEND}" |
| 57 |
|
| 58 |
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) |
| 59 |
+PATCHES=( |
| 60 |
+ "${FILESDIR}/${P}-cmake.patch" |
| 61 |
+ "${FILESDIR}/${PN}-0.85-fno-common.patch" |
| 62 |
+) |
| 63 |
|
| 64 |
src_install() { |
| 65 |
- cmake-utils_src_install |
| 66 |
+ cmake_src_install |
| 67 |
dodoc ../docs/*.TXT |
| 68 |
} |
| 69 |
|
| 70 |
diff --git a/media-video/ccextractor/files/ccextractor-0.85-fno-common.patch b/media-video/ccextractor/files/ccextractor-0.85-fno-common.patch |
| 71 |
new file mode 100644 |
| 72 |
index 00000000000..6e543f74910 |
| 73 |
--- /dev/null |
| 74 |
+++ b/media-video/ccextractor/files/ccextractor-0.85-fno-common.patch |
| 75 |
@@ -0,0 +1,13 @@ |
| 76 |
+https://bugs.gentoo.org/706934 |
| 77 |
+--- a/lib_ccx/ccx_decoders_708.h |
| 78 |
++++ b/lib_ccx/ccx_decoders_708.h |
| 79 |
+@@ -368,7 +368,7 @@ |
| 80 |
+ unsigned char *data, |
| 81 |
+ int data_length); |
| 82 |
+ |
| 83 |
+-ccx_dtvcc_pen_color ccx_dtvcc_default_pen_color; |
| 84 |
+-ccx_dtvcc_pen_attribs ccx_dtvcc_default_pen_attribs; |
| 85 |
++extern ccx_dtvcc_pen_color ccx_dtvcc_default_pen_color; |
| 86 |
++extern ccx_dtvcc_pen_attribs ccx_dtvcc_default_pen_attribs; |
| 87 |
+ |
| 88 |
+ #endif |
Archives