1 |
commit: 2bd95e189e829f2282bea13b6d7b67c2b256ed6a |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 26 07:26:51 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 26 08:51:25 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd95e18 |
7 |
|
8 |
media-video/ccextractor: EAPI-6 bump, HOMEPAGE, cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
11 |
|
12 |
media-video/ccextractor/ccextractor-0.85-r1.ebuild | 16 +++++----------- |
13 |
...-0.85-makefile.patch => ccextractor-0.85-cmake.patch} | 8 ++++---- |
14 |
2 files changed, 9 insertions(+), 15 deletions(-) |
15 |
|
16 |
diff --git a/media-video/ccextractor/ccextractor-0.85-r1.ebuild b/media-video/ccextractor/ccextractor-0.85-r1.ebuild |
17 |
index 35c0f63e14f..aad1f505d1f 100644 |
18 |
--- a/media-video/ccextractor/ccextractor-0.85-r1.ebuild |
19 |
+++ b/media-video/ccextractor/ccextractor-0.85-r1.ebuild |
20 |
@@ -1,12 +1,12 @@ |
21 |
-# Copyright 1999-2017 Gentoo Foundation |
22 |
+# Copyright 1999-2018 Gentoo Foundation |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
-EAPI=5 |
26 |
+EAPI=6 |
27 |
|
28 |
-inherit eutils toolchain-funcs cmake-utils |
29 |
+inherit cmake-utils toolchain-funcs |
30 |
|
31 |
DESCRIPTION="Extract closed captioning subtitles from video to SRT" |
32 |
-HOMEPAGE="http://ccextractor.sourceforge.net/" |
33 |
+HOMEPAGE="https://www.ccextractor.org/" |
34 |
SRC_URI="mirror://sourceforge/ccextractor/${PN}-src-nowin.${PV}.zip" |
35 |
|
36 |
LICENSE="GPL-2" |
37 |
@@ -24,10 +24,4 @@ DEPEND="${RDEPEND} |
38 |
|
39 |
S="${WORKDIR}/${PN}/src" |
40 |
|
41 |
-PATCHES=( |
42 |
- "${FILESDIR}/${P}-makefile.patch" |
43 |
-) |
44 |
- |
45 |
-src_prepare() { |
46 |
- cmake-utils_src_prepare |
47 |
-} |
48 |
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) |
49 |
|
50 |
diff --git a/media-video/ccextractor/files/ccextractor-0.85-makefile.patch b/media-video/ccextractor/files/ccextractor-0.85-cmake.patch |
51 |
similarity index 89% |
52 |
rename from media-video/ccextractor/files/ccextractor-0.85-makefile.patch |
53 |
rename to media-video/ccextractor/files/ccextractor-0.85-cmake.patch |
54 |
index 6937869180d..2fcf6cfee4b 100644 |
55 |
--- a/media-video/ccextractor/files/ccextractor-0.85-makefile.patch |
56 |
+++ b/media-video/ccextractor/files/ccextractor-0.85-cmake.patch |
57 |
@@ -1,5 +1,5 @@ |
58 |
---- ccextractor/src/CMakeLists.txt.orig 2017-07-25 12:22:29.294144514 -0600 |
59 |
-+++ ccextractor/src/CMakeLists.txt 2017-07-25 12:23:33.979149436 -0600 |
60 |
+--- a/CMakeLists.txt 2017-07-25 12:22:29.294144514 -0600 |
61 |
++++ b/CMakeLists.txt 2017-07-25 12:23:33.979149436 -0600 |
62 |
@@ -25,14 +25,13 @@ |
63 |
include_directories ("${PROJECT_SOURCE_DIR}/protobuf-c/") |
64 |
include_directories ("${PROJECT_SOURCE_DIR}/zvbi") |
65 |
@@ -43,8 +43,8 @@ |
66 |
|
67 |
######################################################## |
68 |
# Build using FFmpeg libraries |
69 |
---- ccextractor/src/lib_ccx/CMakeLists.txt.orig 2017-07-25 12:32:32.803190443 -0600 |
70 |
-+++ ccextractor/src/lib_ccx/CMakeLists.txt 2017-07-25 12:25:40.819159089 -0600 |
71 |
+--- a/lib_ccx/CMakeLists.txt 2017-07-25 12:32:32.803190443 -0600 |
72 |
++++ b/lib_ccx/CMakeLists.txt 2017-07-25 12:25:40.819159089 -0600 |
73 |
@@ -1,6 +1,6 @@ |
74 |
cmake_policy (SET CMP0037 NEW) |