commit: f93a2a9cc092ab0254ce4edf54eb6b00bae56b6b Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> AuthorDate: Sun Jul 29 08:41:37 2018 +0000 Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> CommitDate: Sun Jul 29 08:41:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f93a2a9c
media-video/handbrake: Bump to 1.1.1, drop old Fixes: https://bugs.gentoo.org/659470 Package-Manager: Portage-2.3.41, Repoman-2.3.9 media-video/handbrake/Manifest | 3 +- media-video/handbrake/handbrake-0.10.5-r2.ebuild | 155 --------------------- ...ndbrake-1.0.7.ebuild => handbrake-1.1.1.ebuild} | 14 +- 3 files changed, 9 insertions(+), 163 deletions(-) diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index 87e00f41991..9bd0e845dc8 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -1,3 +1,2 @@ -DIST handbrake-0.10.5.tar.bz2 10452839 BLAKE2B 50dd8cc968fc7da262c9a17d4baa7b4093a33746a08afcb8980de539f947f1fd3607dc0d0c3824023d24abd4d430d5418e92d5e939f334e090c1fa192dfdb3ec SHA512 30aa09f5bf2ceb45500f316aa2bc070f630dbe399c9be739f60fd73bbb97d52157498ba7a1e7d024f7fa5b75aa0154976df3c346abda43168c881b1ad0a858ea -DIST handbrake-1.0.7.tar.bz2 12650549 BLAKE2B 54fa6f4ee053de3ce1840695e66b0fef5ac09aed79f61755f146dbf990c624608e9acf2f81e69871ece85daf5a3f09780a75f43567c5b08afc55863495958ec7 SHA512 bacc5ff105893a0fdea95174839663e00027c87a13f00fb67d39c347b55e35869c0b998ec52181389b98cc2cc358d221e41d729e76952e4cb21fe8d12ee5a44a DIST handbrake-1.1.0.tar.bz2 15262590 BLAKE2B b2f892c57cd562124460ac2846949bd0ce05eff0b87fbd733d7102eeda9455f57997fb0bbd72d991d0f2d8ab3f02e6f82d88a0449158c3a947595f50198eb4bd SHA512 48cbbc57e93e74a8aa3d224311f5d97905061e103c3ecb07aa5e09d8f401687679cac0e8952e146fea0fad5d00e6c26fe90159c11e87b8b413469abbe900edc3 +DIST handbrake-1.1.1.tar.bz2 15319551 BLAKE2B d0569a796f3838f5696e3dcfed348a5111e063841cb594bbce7283568cdf868e6b751f3cd6086ebc83af5f2d6ad9e238717425f953677cca9e2908a9c0301aa9 SHA512 990035a5f850fafbc68c77dd61d7f7371c3eda2cc6e6ceb377f111c9016713523cf1685f519926ae8859446c99392c64b7ce91d72f9b5f9643a35a3d0326eef4 diff --git a/media-video/handbrake/handbrake-0.10.5-r2.ebuild b/media-video/handbrake/handbrake-0.10.5-r2.ebuild deleted file mode 100644 index 558ee7f48fc..00000000000 --- a/media-video/handbrake/handbrake-0.10.5-r2.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"; - inherit git-r3 - KEYWORDS="" -else - MY_P="HandBrake-${PV}" - SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.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 libav-aac x265" - -REQUIRED_USE="^^ ( fdk libav-aac )" - -RDEPEND=" - dev-libs/jansson - media-libs/a52dec - media-libs/libass:= - media-libs/libbluray:= - media-libs/libdvdnav - media-libs/libdvdread - media-libs/libsamplerate - media-libs/libtheora - media-libs/libvorbis - media-libs/libvpx - media-libs/x264:= - media-sound/lame - sys-libs/zlib - libav? ( >=media-video/libav-12:0=[fdk?] ) - !libav? ( >=media-video/ffmpeg-2.3: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 - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/libnotify - x11-libs/pango - virtual/libgudev:= - ) - fdk? ( media-libs/fdk-aac ) - x265? ( >=media-libs/x265-1.7: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}/${PN}-9999-fix-missing-x265-link-flag.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 - - # Get rid of libav specific code when using ffmpeg - use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch" - - cd "${S}/gtk" - # Don't run autogen.sh. - sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed" - eautoreconf -} - -src_configure() { - ./configure \ - --force \ - --verbose \ - --prefix="${EPREFIX}/usr" \ - --disable-gtk-update-checks \ - $(use_enable libav-aac) \ - $(use_enable fdk fdk-aac) \ - $(use_enable gtk) \ - $(usex !gstreamer --disable-gst) \ - $(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 AUTHORS CREDITS NEWS THANKS TRANSLATIONS -} - -pkg_postinst() { - einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`." - - if use gtk ; then - einfo "" - einfo "For the GTK+ version of HandBrake, you can run \`ghb\`." - fi - - gnome2_icon_cache_update -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/media-video/handbrake/handbrake-1.0.7.ebuild b/media-video/handbrake/handbrake-1.1.1.ebuild similarity index 88% rename from media-video/handbrake/handbrake-1.0.7.ebuild rename to media-video/handbrake/handbrake-1.1.1.ebuild index 0ce63641f6e..cd52cd8ded2 100644 --- a/media-video/handbrake/handbrake-1.0.7.ebuild +++ b/media-video/handbrake/handbrake-1.1.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # 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 +inherit autotools eutils gnome2-utils python-any-r1 xdg-utils if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"; @@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then KEYWORDS="" else MY_P="HandBrake-${PV}" - SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.tar.bz2 -> ${P}.tar.bz2" + SRC_URI="https://download2.handbrake.fr/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2" S="${WORKDIR}/${MY_P}" KEYWORDS="~amd64 ~x86" fi @@ -42,8 +42,8 @@ RDEPEND=" media-libs/x264:= media-sound/lame sys-libs/zlib - libav? ( >=media-video/libav-10.1:0=[fdk?] ) - !libav? ( >=media-video/ffmpeg-2.3:0=[fdk?] ) + libav? ( >=media-video/libav-12.2:0=[fdk?] ) + !libav? ( >=media-video/ffmpeg-3.4:0=[fdk?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 @@ -99,7 +99,7 @@ src_prepare() { default # Get rid of libav specific code when using ffmpeg - use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch" + use libav || eapply -R "${FILESDIR}/${PN}-1.1.0-nolibav.patch" cd "${S}/gtk" # Don't run autogen.sh. @@ -145,6 +145,7 @@ pkg_postinst() { fi gnome2_icon_cache_update + xdg_desktop_database_update } pkg_preinst() { @@ -153,4 +154,5 @@ pkg_preinst() { pkg_postrm() { gnome2_icon_cache_update + xdg_desktop_database_update }
