| 1 |
commit: 20c0969abc918f14a74b0586556a1fb5f9181be7 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 26 12:20:27 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 26 12:50:39 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20c0969a |
| 7 |
|
| 8 |
media-video/ffmpeg2theora: Port to py3 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/735546 |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
...ra-0.30.ebuild => ffmpeg2theora-0.30-r1.ebuild} | 27 ++++++++++++++-------- |
| 14 |
.../files/ffmpeg2theora-0.29-underlinking.patch | 4 ++-- |
| 15 |
2 files changed, 19 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild |
| 18 |
similarity index 69% |
| 19 |
rename from media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild |
| 20 |
rename to media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild |
| 21 |
index 49c6e4674e0..0e9cd2e06d0 100644 |
| 22 |
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild |
| 23 |
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild |
| 24 |
@@ -1,8 +1,10 @@ |
| 25 |
# Copyright 1999-2020 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
-EAPI=5 |
| 29 |
-inherit eutils toolchain-funcs scons-utils |
| 30 |
+EAPI=7 |
| 31 |
+ |
| 32 |
+PYTHON_COMPAT=( python3_{6..9} ) |
| 33 |
+inherit python-any-r1 scons-utils toolchain-funcs |
| 34 |
|
| 35 |
DESCRIPTION="A simple converter to create Ogg Theora files" |
| 36 |
HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/" |
| 37 |
@@ -19,30 +21,35 @@ RDEPEND=" |
| 38 |
>=media-libs/libogg-1.1 |
| 39 |
>=media-libs/libtheora-1.1[encode] |
| 40 |
kate? ( >=media-libs/libkate-0.3.7 )" |
| 41 |
-DEPEND="${RDEPEND} |
| 42 |
+DEPEND="${RDEPEND}" |
| 43 |
+BDEPEND=" |
| 44 |
virtual/pkgconfig" |
| 45 |
|
| 46 |
+PATCHES=( |
| 47 |
+ "${FILESDIR}"/${PN}-0.29-swr.patch |
| 48 |
+ "${FILESDIR}"/${PN}-0.29-underlinking.patch |
| 49 |
+) |
| 50 |
+ |
| 51 |
src_prepare() { |
| 52 |
- epatch \ |
| 53 |
- "${FILESDIR}"/${PN}-0.29-swr.patch \ |
| 54 |
- "${FILESDIR}"/${PN}-0.29-underlinking.patch |
| 55 |
+ default |
| 56 |
+ 2to3 -n -w --no-diffs SConstruct || die |
| 57 |
} |
| 58 |
|
| 59 |
src_configure() { |
| 60 |
- myesconsargs=( |
| 61 |
+ SCONSARGS=( |
| 62 |
APPEND_CCFLAGS="${CFLAGS}" |
| 63 |
APPEND_LINKFLAGS="${LDFLAGS}" |
| 64 |
prefix=/usr |
| 65 |
mandir=PREFIX/share/man |
| 66 |
libkate=$(usex kate 1 0) |
| 67 |
- ) |
| 68 |
+ ) |
| 69 |
} |
| 70 |
|
| 71 |
src_compile() { |
| 72 |
- escons |
| 73 |
+ escons "${SCONSARGS[@]}" |
| 74 |
} |
| 75 |
|
| 76 |
src_install() { |
| 77 |
- escons destdir="${D}" install |
| 78 |
+ escons "${SCONSARGS[@]}" destdir="${D}" install |
| 79 |
dodoc AUTHORS ChangeLog README subtitles.txt TODO |
| 80 |
} |
| 81 |
|
| 82 |
diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch |
| 83 |
index dc877603913..791e39d8774 100644 |
| 84 |
--- a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch |
| 85 |
+++ b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch |
| 86 |
@@ -6,8 +6,8 @@ v = pow(v, g) * 255.0; // mplayer's vf_eq2.c multiplies with 256 here, strang |
| 87 |
|
| 88 |
For build failure and log, see Gentoo bug #504698 |
| 89 |
|
| 90 |
---- SConstruct |
| 91 |
-+++ SConstruct |
| 92 |
+--- a/SConstruct |
| 93 |
++++ b/SConstruct |
| 94 |
@@ -206,9 +206,8 @@ |
| 95 |
if env['crossmingw']: |
| 96 |
env.Append(CCFLAGS=['-Wl,-subsystem,windows']) |
Archives