diff options
author | Ian Whyman <thev00d00@gentoo.org> | 2020-06-27 09:17:05 +0100 |
---|---|---|
committer | Ian Whyman <thev00d00@gentoo.org> | 2020-06-27 10:39:04 +0100 |
commit | 927f4ed4b243fa5db70f8f0a5e4f7041dd5e0eb3 (patch) | |
tree | 03eb42f39fa623dd72f9de85a9c3cfc3d8aec5f1 /media-video/handbrake/files | |
parent | app-admin/syslog-ng: Fix libafsnmp.so linking (diff) | |
download | gentoo-927f4ed4b243fa5db70f8f0a5e4f7041dd5e0eb3.tar.gz gentoo-927f4ed4b243fa5db70f8f0a5e4f7041dd5e0eb3.tar.bz2 gentoo-927f4ed4b243fa5db70f8f0a5e4f7041dd5e0eb3.zip |
media-video/handbrake: Tidy old
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Ian Whyman <thev00d00@gentoo.org>
Diffstat (limited to 'media-video/handbrake/files')
-rw-r--r-- | media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch | 88 | ||||
-rw-r--r-- | media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch | 13 |
2 files changed, 0 insertions, 101 deletions
diff --git a/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch b/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch deleted file mode 100644 index 0618c9004e96..000000000000 --- a/media-video/handbrake/files/handbrake-1.2.2-backport-hardware-configure.patch +++ /dev/null @@ -1,88 +0,0 @@ -From c7119499f5a2da7e5be0afd50a6757778fed53e7 Mon Sep 17 00:00:00 2001 -From: Bradley Sepos <bradley@bradleysepos.com> -Date: Sat, 23 Feb 2019 11:44:34 -0500 -Subject: [PATCH] configure: Enable hardware encoders by default on suitable - platforms. - -Print special encoders status at end of configure output, minor cosmetics. ---- - make/configure.py | 46 +++++++++++++++++++++++++++++----------------- - 1 file changed, 29 insertions(+), 17 deletions(-) - -diff --git a/make/configure.py b/make/configure.py -index c8bc712fe5..e673c9c5a0 100644 ---- a/make/configure.py -+++ b/make/configure.py -@@ -1298,36 +1298,37 @@ def createCLI(): - grp.add_option( '--disable-gtk', default=False, action='store_true', help=h ) - - h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value -- - grp.add_option( '--disable-gtk-update-checks', default=False, action='store_true', help=h ) - - h = IfHost( 'enable GTK GUI (mingw)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value - grp.add_option( '--enable-gtk-mingw', default=False, action='store_true', help=h ) - - h = IfHost( 'disable GStreamer (live preview)', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value -- - grp.add_option( '--disable-gst', default=False, action='store_true', help=h ) - -- h = IfHost( 'enable Intel Quick Sync Video (QSV) hardware acceleration. (Windows and Linux only)', '*-*-linux*', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value -- grp.add_option( '--enable-qsv', default=False, action='store_true', help=h ) -+ h = IfHost( 'Intel Quick Sync Video (QSV) hardware acceleration (Windows and Linux only)', '*-*-linux*', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value -+ grp.add_option( '--enable-qsv', dest="enable_qsv", default=host.match( '*-*-mingw*' ), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) ) -+ grp.add_option( '--disable-qsv', dest="enable_qsv", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) ) - -- h = IfHost( 'enable AMD VCE hardware acceleration. (Windows only)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value -- grp.add_option( '--enable-vce', default=False, action='store_true', help=h ) -+ h = IfHost( 'AMD VCE hardware acceleration (Windows only)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value -+ grp.add_option( '--enable-vce', dest="enable_vce", default=host.match( '*-*-mingw*' ), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) ) -+ grp.add_option( '--disable-vce', dest="enable_vce", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) ) - -- h = IfHost( 'enable x265 video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value -- grp.add_option( '--enable-x265', dest="enable_x265", default=True, action='store_true', help=h ) -- grp.add_option( '--disable-x265', dest="enable_x265", action='store_false' ) -+ h = IfHost( 'x265 video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value -+ grp.add_option( '--enable-x265', dest="enable_x265", default=True, action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) ) -+ grp.add_option( '--disable-x265', dest="enable_x265", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) ) - -- h = IfHost( 'enable FDK AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value -- grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=False, action='store_true', help=h ) -- grp.add_option( '--disable-fdk-aac', dest="enable_fdk_aac", action='store_false' ) -+ h = IfHost( 'FDK AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value -+ grp.add_option( '--enable-fdk-aac', dest="enable_fdk_aac", default=False, action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) ) -+ grp.add_option( '--disable-fdk-aac', dest="enable_fdk_aac", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) ) - -- h = IfHost( 'enable FFmpeg AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value -- grp.add_option( '--enable-ffmpeg-aac', dest="enable_ffmpeg_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=h ) -- grp.add_option( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false' ) -+ h = IfHost( 'FFmpeg AAC audio encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value -+ grp.add_option( '--enable-ffmpeg-aac', dest="enable_ffmpeg_aac", default=not host.match( '*-*-darwin*' ), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) ) -+ grp.add_option( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) ) - -- h = IfHost( 'enable Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value -- grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' )), action='store_true', help=h ) -+ h = IfHost( 'Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value -+ grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' )), action='store_true', help=(( 'enable %s' %h ) if h != optparse.SUPPRESS_HELP else h) ) -+ grp.add_option( '--disable-nvenc', dest="enable_nvenc", action='store_false', help=(( 'disable %s' %h ) if h != optparse.SUPPRESS_HELP else h) ) - - - cli.add_option_group( grp ) -@@ -1982,6 +1983,17 @@ class Tools: - else: - nocd = False - -+ stdout.write( '%s\n' % ('-' * 79) ) -+ stdout.write( 'Configured options:\n' ) -+ stdout.write( 'Enable FDK-AAC: %s\n' % options.enable_fdk_aac ) -+ stdout.write( 'Enable FFmpeg AAC: %s\n' % options.enable_ffmpeg_aac ) -+ -+ if IfHost( True, '*-*-linux*', '*-*-mingw*', none=False ).value is True: -+ stdout.write( 'Enable NVEnc: %s\n' % options.enable_nvenc ) -+ stdout.write( 'Enable QSV: %s\n' % options.enable_qsv ) -+ if IfHost( True, '*-*-mingw*', none=False ).value is True: -+ stdout.write( 'Enable VCE: %s\n' % options.enable_vce ) -+ - stdout.write( '%s\n' % ('-' * 79) ) - if options.launch: - stdout.write( 'Build is finished!\n' ) diff --git a/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch b/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch deleted file mode 100644 index a999fc325646..000000000000 --- a/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch +++ /dev/null @@ -1,13 +0,0 @@ -Written by: Peter Foley <pefoley2@pefoley.com> -Gentoo Bug: #552792 - ---- ./test/module.defs.bak 2015-06-21 13:19:40.626249439 -0400 -+++ ./test/module.defs 2015-06-21 13:19:54.919757726 -0400 -@@ -25,6 +25,7 @@ - - ifeq (1,$(FEATURE.x265)) - TEST.GCC.D += USE_X265 -+ TEST.GCC.l += x265 - endif - - TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs)) |