commit: fe3d914b623aa403e90098a23968b394b2f0e6c3 Author: James Beddek <telans <AT> posteo <DOT> de> AuthorDate: Sun Oct 24 07:15:28 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 24 08:21:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe3d914b
media-video/handbrake: add 1.4.2 Closes: https://bugs.gentoo.org/806392 Closes: https://bugs.gentoo.org/738110 Closes: https://bugs.gentoo.org/804891 Signed-off-by: James Beddek <telans <AT> posteo.de> Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/handbrake-9999-system-tools.patch | 24 ++++++++++++++++++++++ media-video/handbrake/handbrake-1.4.2.ebuild | 4 ++++ 2 files changed, 28 insertions(+) diff --git a/media-video/handbrake/files/handbrake-9999-system-tools.patch b/media-video/handbrake/files/handbrake-9999-system-tools.patch new file mode 100644 index 00000000000..9d76e628ccb --- /dev/null +++ b/media-video/handbrake/files/handbrake-9999-system-tools.patch @@ -0,0 +1,24 @@ +# https://bugs.gentoo.org/738110 + +diff --git a/make/configure.py b/make/configure.py +index 87118fcbe..df869856d 100644 +--- a/make/configure.py ++++ b/make/configure.py +@@ -1626,14 +1626,14 @@ try: + + ## create tools in a scope + class Tools: +- ar = ToolProbe( 'AR.exe', 'ar', 'ar', abort=True ) ++ ar = ToolProbe( 'AR.exe', 'ar', os.environ.get('AR', 'ar'), abort=True ) + cp = ToolProbe( 'CP.exe', 'cp', 'cp', abort=True ) + m4 = ToolProbe( 'M4.exe', 'm4', 'gm4', 'm4', abort=True ) + mkdir = ToolProbe( 'MKDIR.exe', 'mkdir', 'mkdir', abort=True ) + patch = ToolProbe( 'PATCH.exe', 'patch', 'gpatch', 'patch', abort=True ) + rm = ToolProbe( 'RM.exe', 'rm', 'rm', abort=True ) +- ranlib = ToolProbe( 'RANLIB.exe', 'ranlib', 'ranlib', abort=True ) +- strip = ToolProbe( 'STRIP.exe', 'strip', 'strip', abort=True ) ++ ranlib = ToolProbe( 'RANLIB.exe', 'ranlib', os.environ.get('RANLIB', 'ranlib'), abort=True ) ++ strip = ToolProbe( 'STRIP.exe', 'strip', os.environ.get('STRIP', 'strip'), abort=True ) + tar = ToolProbe( 'TAR.exe', 'tar', 'gtar', 'tar', abort=True ) + python = ToolProbe( 'PYTHON.exe', 'python', os.path.basename(sys.executable), abort=True ) + diff --git a/media-video/handbrake/handbrake-1.4.2.ebuild b/media-video/handbrake/handbrake-1.4.2.ebuild index 80d947f2777..2978319d46f 100644 --- a/media-video/handbrake/handbrake-1.4.2.ebuild +++ b/media-video/handbrake/handbrake-1.4.2.ebuild @@ -44,6 +44,7 @@ RDEPEND=" nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= + media-libs/zimg media-sound/lame sys-libs/zlib >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?] @@ -86,6 +87,9 @@ PATCHES=( # Remove faac dependency; TODO: figure out if we need to do this at all. "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch" + # Detect system tools - bug 738110 + "${FILESDIR}/${PN}-9999-system-tools.patch" + # Use whichever python is set by portage "${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
