summaryrefslogtreecommitdiff
path: root/media-video/ffmpeg2theora
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-09-30 17:27:54 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-09-30 17:27:54 +0100
commitf70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
treee907cb121b30e3c1df1710719c0ddf4029597a47 /media-video/ffmpeg2theora
parentdb063b515939ab15261136b24e4bc44386335c0c (diff)
gentoo resync : 30.09.2020
Diffstat (limited to 'media-video/ffmpeg2theora')
-rw-r--r--media-video/ffmpeg2theora/Manifest4
-rw-r--r--media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild (renamed from media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild)27
-rw-r--r--media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch4
3 files changed, 21 insertions, 14 deletions
diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest
index b44c564d0c99..f243e4e52596 100644
--- a/media-video/ffmpeg2theora/Manifest
+++ b/media-video/ffmpeg2theora/Manifest
@@ -1,5 +1,5 @@
AUX ffmpeg2theora-0.29-swr.patch 778 BLAKE2B e0b57be8a1941abc1c3c2c01939dc339a705c9cc7ce1a0de81a868023dc6d9bb7593ae3b7c10cae9ad9e3418819637a2f9e20c42409047f5b9d5686864eacf15 SHA512 38ab469efff0f7607cbc8d8b9c57e1b4e92ce02ff2d4380aa2a04e1e3092e8b5fb2b95eb1c761df4809333d6979cb66fcd8892d245777d375adacfdd82d07c73
-AUX ffmpeg2theora-0.29-underlinking.patch 503 BLAKE2B 2d6d4fb7c23a2fc439b519348a2b39ea30ab00c5a12f5c37f2ae8965d42af5baa4465172e163cd66a63810b3c13923068d8debad495197ec1bc7d469710dbdc5 SHA512 a9c16e115d72400cd29c60e9893b89e37a1c4800edebc23ebd576c47b49c37ec69e31fe2de4bef50a32c1f60a1be5df5dae2b62000e8f558b30c440938652632
+AUX ffmpeg2theora-0.29-underlinking.patch 507 BLAKE2B 337a94a9a948d375a4930686951d1b0db4c8e8bf97c63c2e46729b721e9c0b11e7c5dae648826b5afda0b35e22f8cc4e876513a74831d61c436bcb3937719d51 SHA512 44be5be61ab9786446d49498cf0496b9600b65ecba9b1199f98ee9030f5224887f6a1de73eaab1ee04cefa391ffcfd8629eb4cb9d3e28216569b570cc1e96e48
DIST ffmpeg2theora-0.30.tar.bz2 91269 BLAKE2B e5a57679cb874e7052db184e8e24b60da640ed818affa228cf5353216c64d2805aee375f67cfa2653112beafa36d492a274ced745846e53f81101e0f97418c41 SHA512 2c77d2c5e705751928e2bfd86c4fe4c2b7df2ca2ce70f3dfeb0014a3269eef067587eaa045c11b0db86c69176d8f01a43b3ad75544d181c016a89aa50b6518c1
-EBUILD ffmpeg2theora-0.30.ebuild 1023 BLAKE2B 6315347ccdf5cbed4c800a8f8bf12171cd386150bc9d2f193e106cf110982f299af03ef81670a77d00068d560629d6b225bdf2ad72f4893c4e74ee08411c236b SHA512 e1714a54d6d9309bbee045459dccec01fceb9ffca413de14021f8aca6487dd3de8ae08fd9fdf5676ad4cb16d5793126caca717fc45574b2c4ca56df76ce03478
+EBUILD ffmpeg2theora-0.30-r1.ebuild 1156 BLAKE2B 13eb425d21e1f029a32989a9c0b2565993891517564ae82ccbf3689573c98260aeb6d24790646dc9d03e9a0327a884e54d1384d07fe51caa13f809b48a9e37a3 SHA512 d879272ac2899f5d50689a7642da9989e07dfc8f4c13b500e2dc3e18128de48d0317c55e3ef00b86f4a2b28b4a0a05e755a66e1521a2ab7bcc18a01f9dff6173
MISC metadata.xml 314 BLAKE2B d200d644a8e139816ef36f882f1adf6025a292cfcc6fbfc820265b84a8fc564ad427b0815fb30024ca3d90cf7f42738896cee49e92fc5f8a1e55566051015220 SHA512 2cc51e06842a129ba5e490939f29861b36a1919086aae97a1f5639b56b211700b3839ac66898d0e14b25a3b1471869266ccbff47d2fd98a0baae429514466f54
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
index 49c6e4674e0a..0e9cd2e06d01 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
@@ -1,8 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils toolchain-funcs scons-utils
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-any-r1 scons-utils toolchain-funcs
DESCRIPTION="A simple converter to create Ogg Theora files"
HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
@@ -19,30 +21,35 @@ RDEPEND="
>=media-libs/libogg-1.1
>=media-libs/libtheora-1.1[encode]
kate? ( >=media-libs/libkate-0.3.7 )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.29-swr.patch
+ "${FILESDIR}"/${PN}-0.29-underlinking.patch
+)
+
src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-0.29-swr.patch \
- "${FILESDIR}"/${PN}-0.29-underlinking.patch
+ default
+ 2to3 -n -w --no-diffs SConstruct || die
}
src_configure() {
- myesconsargs=(
+ SCONSARGS=(
APPEND_CCFLAGS="${CFLAGS}"
APPEND_LINKFLAGS="${LDFLAGS}"
prefix=/usr
mandir=PREFIX/share/man
libkate=$(usex kate 1 0)
- )
+ )
}
src_compile() {
- escons
+ escons "${SCONSARGS[@]}"
}
src_install() {
- escons destdir="${D}" install
+ escons "${SCONSARGS[@]}" destdir="${D}" install
dodoc AUTHORS ChangeLog README subtitles.txt TODO
}
diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
index dc877603913a..791e39d87744 100644
--- a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
+++ b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
@@ -6,8 +6,8 @@ v = pow(v, g) * 255.0; // mplayer's vf_eq2.c multiplies with 256 here, strang
For build failure and log, see Gentoo bug #504698
---- SConstruct
-+++ SConstruct
+--- a/SConstruct
++++ b/SConstruct
@@ -206,9 +206,8 @@
if env['crossmingw']:
env.Append(CCFLAGS=['-Wl,-subsystem,windows'])