commit: 927f4ed4b243fa5db70f8f0a5e4f7041dd5e0eb3 Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> AuthorDate: Sat Jun 27 08:17:05 2020 +0000 Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> CommitDate: Sat Jun 27 09:39:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=927f4ed4
media-video/handbrake: Tidy old Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org> media-video/handbrake/Manifest | 1 - ...ndbrake-1.2.2-backport-hardware-configure.patch | 88 ----------- ...andbrake-1.2.2-fix-missing-x265-link-flag.patch | 13 -- media-video/handbrake/handbrake-1.2.2-r3.ebuild | 168 --------------------- 4 files changed, 270 deletions(-) diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index 70dab8d3bfb..bf3bc269790 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -1,3 +1,2 @@ -DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e SHA512 434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c DIST handbrake-1.3.0.tar.bz2 16801695 BLAKE2B 2a71674f557562317ed643064f252f3f88815a0b2fbbf9478f79efdd18282304443a29120effdce8ed9b07d00896d0946be0a7f4a94ae65252f9935c97829fb4 SHA512 40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d DIST handbrake-1.3.2.tar.bz2 16813741 BLAKE2B b59186f60d12a5478b2a34f736c9450ce6bba98f0606fc42af11c64f55b2324177302d49089003a39d0a8c1d82776211573a7c4ef1b6b6fabdbc35aed2e5cde7 SHA512 857f358a8754b08e55acfddb1431d99cc1035cf52174ab1d5243524fffe60e6cbc7d2a5d5912d55e6dc6b8ec621d503ebd21614a9064706a95c920e72a760f6a 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 0618c9004e9..00000000000 --- 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 <[email protected]> -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 a999fc32564..00000000000 --- 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 <[email protected]> -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)) diff --git a/media-video/handbrake/handbrake-1.2.2-r3.ebuild b/media-video/handbrake/handbrake-1.2.2-r3.ebuild deleted file mode 100644 index 723f649b7e2..00000000000 --- a/media-video/handbrake/handbrake-1.2.2-r3.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eutils gnome2-utils python-any-r1 xdg-utils - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"; - inherit git-r3 - KEYWORDS="" -else - MY_P="HandBrake-${PV}" - SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}/${MY_P}" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder" -HOMEPAGE="http://handbrake.fr/"; -LICENSE="GPL-2" - -SLOT="0" -IUSE="+fdk gstreamer gtk libav-aac nvenc x265" - -REQUIRED_USE="^^ ( fdk libav-aac )" - -RDEPEND=" - app-arch/xz-utils - media-libs/speex - dev-libs/jansson - media-libs/a52dec - media-libs/libass:= - >=media-libs/libbluray-1.0 - media-libs/libdvdnav - media-libs/libdvdread - media-libs/libsamplerate - media-libs/libtheora - media-libs/libvorbis - media-libs/libvpx - nvenc? ( media-libs/nv-codec-headers ) - media-libs/opus - media-libs/x264:= - media-sound/lame - sys-libs/zlib - >=media-video/ffmpeg-4.1:0=[fdk?] - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 - media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-ugly:1.0 - media-plugins/gst-plugins-a52dec:1.0 - media-plugins/gst-plugins-libav:1.0 - media-plugins/gst-plugins-x264:1.0 - ) - gtk? ( - >=x11-libs/gtk+-3.10 - dev-libs/dbus-glib - dev-libs/glib:2 - dev-libs/libgudev:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/libnotify - x11-libs/pango - ) - fdk? ( media-libs/fdk-aac ) - x265? ( >=media-libs/x265-2.9:0= ) - " - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-lang/yasm - dev-util/intltool - sys-devel/automake" - -PATCHES=( - # Remove libdvdnav duplication and call it on the original instead. - # It may work this way; if not, we should try to mimic the duplication. - "${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch" - - # Remove faac dependency; TODO: figure out if we need to do this at all. - "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch" - - # Fix missing x265 link flag - "${FILESDIR}/${P}-fix-missing-x265-link-flag.patch" - - # Allow disabling nvenc etc - "${FILESDIR}/${P}-backport-hardware-configure.patch" -) - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - # Get rid of leftover bundled library build definitions, - sed -i 's:.*\(/contrib\|contrib/\).*::g' \ - "${S}"/make/include/main.defs \ - || die "Contrib removal failed." - - default - - cd "${S}/gtk" - # Don't run autogen.sh. - sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed" - eautoreconf -} - -src_configure() { - # Libav was replaced in 1.2 with ffmpeg by default - # but I've elected to not make people change their use flags for AAC - # as its the same code anyway - ./configure \ - --force \ - --verbose \ - --prefix="${EPREFIX}/usr" \ - --disable-gtk-update-checks \ - $(use_enable libav-aac ffmpeg-aac) \ - $(use_enable fdk fdk-aac) \ - $(use_enable gtk) \ - $(usex !gstreamer --disable-gst) \ - $(use_enable nvenc) \ - $(use_enable x265) || die "Configure failed." -} - -src_compile() { - emake -C build - - # TODO: Documentation building is currently broken, try to fix it. - # - # if use doc ; then - # emake -C build doc - # fi -} - -src_install() { - emake -C build DESTDIR="${D}" install - - dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown -} - -pkg_postinst() { - einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they" - einfo "do not use the bundled (and often patched) upstream libraries." - einfo "" - einfo "Please do not raise bugs with upstream because of these ebuilds," - einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead." - - einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`." - if use gtk ; then - einfo "For the GTK+ version of HandBrake, you can run \`ghb\`." - fi - - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -}
