From 386b21abf710be445cbf5b62acb4eab2c835ccf9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 1 Feb 2015 23:18:40 +0000 Subject: [PATCH] Introduce USE=libav to control the preferred implementation. Add subslot op to force rebuilds on ABI change. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- media-video/handbrake/ChangeLog | 11 +- media-video/handbrake/Manifest | 27 +++- .../handbrake/handbrake-0.10.0-r1.ebuild | 148 ++++++++++++++++++ media-video/handbrake/handbrake-9999.ebuild | 9 +- 4 files changed, 187 insertions(+), 8 deletions(-) create mode 100644 media-video/handbrake/handbrake-0.10.0-r1.ebuild diff --git a/media-video/handbrake/ChangeLog b/media-video/handbrake/ChangeLog index 6488709cb71d..3bf1722c30b3 100644 --- a/media-video/handbrake/ChangeLog +++ b/media-video/handbrake/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-video/handbrake -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.27 2014/12/13 12:15:56 thev00d00 Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.28 2015/02/01 23:18:38 mgorny Exp $ + +*handbrake-0.10.0-r1 (01 Feb 2015) + + 01 Feb 2015; Michał Górny +handbrake-0.10.0-r1.ebuild, + handbrake-9999.ebuild: + Introduce USE=libav to control the preferred implementation. Add subslot op to + force rebuilds on ABI change. 13 Dec 2014; Ian Whyman handbrake-0.10.0.ebuild, handbrake-9999.ebuild: diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index d9014754f3eb..2b01b1b92ac7 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX handbrake-0.9.9-add-gmodule-to-gtk-configure.patch 414 SHA256 264ed74e5359c6199ef31e91328c39939637abf22d0aab2611d09547a02ae694 SHA512 ae6b1235e432d5990ef2815bee22b674044f7701c9a5db79caedd0dd47d4b08a16bc1c13afb1720f7758e8fb4187cb8f42334816761256c643e04bd00dcc5752 WHIRLPOOL 17cdaa96619f69b54851738a079113ae6855a165889b06aafd5edb5b72aaf49c2a574a83357f82730347cf64035189ce13928d6824263390f39779f5ccf25809 AUX handbrake-0.9.9-fix-compilation-with-mp4v2-v1.9.1.patch 2213 SHA256 99e9cbc302a8ab0bf3714894de293267875af5373917ce9a1cfa6ce304acfbbf SHA512 f316cd54468dd960913aed7cbf79fe57df4c3e07112149ee3591886e0c03be55a999e94f9524d1415689f93da7c7f840fc78b25c7277c95c40153d5cc22b12f2 WHIRLPOOL debfb3e6bc7767898ab2ef4881dfe5997f6b92844079b6fb03eb4030b14effa47fe411e7b2683d6a39b3c66dea4cbe9862e89abf3563477a14b90f331c43658f AUX handbrake-0.9.9-remove-faac-dependency.patch 7478 SHA256 dd8b096ee47dfdc2bb3d3c3a9bff3596f0d88b6d5bb428f775aff597c229d83a SHA512 6815ae03b0688df3aa4c7091c7fe2461abed2e1c5f7c72324b3cc677f7bf00e38ce7c28d8525fe79febe8689ee67ebd05e7cbb5eb5ab7c328a8e8972372f7497 WHIRLPOOL 9fa277f7e0f5b2e4efe8ae415509fd3e574e270bb51a8a76e639284f50c3d3b05a929b01cbdb8ad0b008aabbe47780161d600eca3a0f6aa12bf442b4421a1cd5 @@ -9,8 +12,28 @@ AUX handbrake-9999-use-older-libmkv.patch 583 SHA256 17e15eccc630bf5dfcd66609d19 AUX handbrake-9999-use-unpatched-a52.patch 944 SHA256 b8ccdecb0a70650af162fa649a323dd1c31268efe7c9ace58a89d70eab984c80 SHA512 aff9da64a434946600d1683f101bea1024319a418c57b0dbe9a8c287c72edf91d18102d51b817d9cea6e825d3a945741893956c55df16bf8f61b415a50dbeab4 WHIRLPOOL 97cf18bb453b435f88a60ed6417811eb8ce5c7af68f4e3d12316a72ac1594637f288511b54aee2b50fc04c356a0dba23dcf71b5712e9520371ab112f99b4f90f DIST handbrake-0.10.0.tar.bz2 10370718 SHA256 a91042da3cc08454844f7c171ee2fde4f0ed08176407fc0328d5118227ed4114 SHA512 e1793bf11aae384a63bdbb055b7b8998e13053d4519890ef6b6eb73988c5fb88c18e394e6c8f0af92cf7ba62a19ee83d908701a1f376adc2804c31192584d590 WHIRLPOOL 04379fd65000282c7472539aa6621ac668970529c3349f55c1ce5d60a6d96047a3a7e2d5d0d97ec002970769c7b8228ae67ac5623e814c3b2b27192351d8546b DIST handbrake-0.9.9.tar.bz2 9315199 SHA256 a71dd774104cda00cfb51a813550351d638253791f2f419d04a66f3158a835b3 SHA512 c891e78f5fbc62fd46055bf6cd62e631bc181a2a21167dcf3fe18cbc4b57bb36c11d52dcf39b3c923b807160e79fb2b1f3c36d60f3024149206a86e7bd6d5b68 WHIRLPOOL edcb7758ba68e35b70700bbf484ac7794739a14302d205c080ad4fdf3151b460ee54b0c8dfffd68bca2ccb1a7d4379c9bbb7c3a9939c6bd6a06e1be95f09169e +EBUILD handbrake-0.10.0-r1.ebuild 3401 SHA256 2c332503d0d511ecede62c4687026d382744672dca059e5f43cbdf7fe2a6a755 SHA512 c6db9d1096161ec0cbf840d5e436d59fb50bb6070b6f0e520c4d7e47e9f732680cb6e15da64bee5d8dfebaade0ddd3a6dea2f110c4a690a23ef8fb0b98de267b WHIRLPOOL cea3574d31d1e7afe40b3135811f71c777328d681b166006ddfed1d7b878567fdec0e1a8e6d9e4bd9232a8043951279da6487d9a91ec89c62cadb837483afe55 EBUILD handbrake-0.10.0.ebuild 3374 SHA256 f3d3866a43042567afa69360a713362995545845ca02e246a3b2ee362e3e0ffa SHA512 d55ed0783381de72dd24f91d39506552f342691dcc9a8b094a84fcd9ab339b7a329cced4c0638d7b446d399ab7260bc65e068f2fdc82dabf9e1be40ae2076414 WHIRLPOOL f72c7e7897d2b0b15f1b7fd82f85d62cc6030574033b139caa92ff3ad2d94aa865a91666806b2a6c01c425eccecab1fc6d2c85e8a0cac78763eb7485146d0a84 EBUILD handbrake-0.9.9-r1.ebuild 4518 SHA256 024380ce825648de94df184e8929ec6fa6e4ef50a5d8fa8163396f8b11b732aa SHA512 bfb8c19a94b988c14644f2b6e88fdc43c1afdf93c019005357682a3001e246d463233c513bb13a30242c59f05f322b47ab6654f5f96f49db9fc3877b15cc07db WHIRLPOOL d6f472b54e52b4ed05c70920111500c3632953e0d11df0598fbb26ad4d6ab05e6e383d005dc920a6e144560638691becbbcf7600878d0b4e2eb0959542fdb488 -EBUILD handbrake-9999.ebuild 3373 SHA256 1b06a9060aa53b791a4ddfda9e702aeca58ce0c9168d411d37996025513326bb SHA512 0e322e7393caf3322f06ffb9080ce3b14948472ab06d576d994662e02037f414ae646309f753e4d2e0aae38b8d2aa4cc181ca8b33eab4442355b627e0b51241d WHIRLPOOL 7073d24e780ad90e29ea2f5f6abb62569f6fd489cade27d4403bc5dbb6f03d146246d05d23b9cde083af2aef85cc4dfb059ffcaabcba0b7ed3dbc7397c278d99 -MISC ChangeLog 7140 SHA256 103cf24de0ad064bdc9f64965c155c1c0d682f0e52cb0f91b5fd5a50813b11ce SHA512 f50f6ab07eb56b4b01d9b4137184838565a63026407e87589226fbb3c9ca200b43193d504157351dc84be2d65debc8da7001ef215c6d131818839cbc16e9e97b WHIRLPOOL c384a9b96cc0bd550cf20cef6a979a79b335ae2b51df0bcba9afb2aee04247aacb49c574e06f72729999e0e6dc410d22b8327bfd02ba113c464ccfdae474b369 +EBUILD handbrake-9999.ebuild 3397 SHA256 c5a072cdbb6e82cb679198fbeae961c4a110ac09c7008b8e59d6d1145f4ef1a2 SHA512 5c8461e6e27698320e7eebc19754f659ea498b16e3e1ddba3c894c87f563e244a44dc9dfa96d73184de153d1991a657dabefc9ffe3db3215cb89985f52035cca WHIRLPOOL 4bea4b59351c27a1d4714d0eddb3ccda146b1f290009670d1213844067e43ded3c4761922fc557399b2f9e995e37b0ee0ad89d80114b03c1cf38ebaec513f2fb +MISC ChangeLog 7391 SHA256 85dbb169e26e5505460661338f5b90ecaa1313efd6a9eea3d24791a8cc390baf SHA512 66570bbcb0abd1ea60ddcd41b9d02c80296131d9155524438667c386d77f57c9987e4d7005f255e346676bdde27906a9cfb367e2e970154de64db12134d09549 WHIRLPOOL c31f5686e91da059e594a29180138a51649500508ecbec0efbd79ea3b19618fa5aa48e7cdbde55e18503158a873003c9aab604c25f733b6113a0ef5033139845 MISC metadata.xml 965 SHA256 b7b2e56e2f6d33e2f70a1e600f25234e8d6898314f486bac32cf1a1edade629a SHA512 a73fbd72a03eae58f9135d246e50db1e5785e36d3c03ad16d7105e81d5588917d0f3da32e9da0ae24981b5476c974ed3f2231793e166a03f618ad54032f40d6c WHIRLPOOL 716a2afc323ca728d4b3adb5e0a7ce70e7ca62c8b1daac9ce0a7d1438a7b1f604a5d0eb095fae551a2789358608464f8b91de4b15389bae6257563841faa51f4 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQJ8BAEBCABmBQJUzrRQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOnJkQAI9UuLROPvT+6PG8BEarvAKy +M30tAI44OP416VgNKwjKI4nc1unNVsYxsIqmDAZEIKoL6s25+1zogf5S3vYIiVxS +d00xWMUhQKYgIP7YM5LnwStPCnayZlQNg4LNE+3DJ7ZPDF8mrTHjYuqxOBO40tc0 +QEq/LGVCFmy1325BxA7zH+Mm0xnWAZDjKtrrhP/e9b3jYFNNZg9Mxq6WtOmde9Hm +/HNu+W/YDDMudrM1rE/PFmUsrJlQrAqvAylWSS+YeQV3fH3ZBtwwoJtn0O6Qwnss +5Yx6Vz1htfxdZhVKNNvTf0I5O1sgUm/P2RIJnjvtpG6zDfXRBqiP7k0qXb+9DAYF +gt8sgjItCvx+8mxlz5kt/Ta7ORJYaFovi0a5xB2YcZ+uxL/81lNY9fWzLvMjuoGN +dn0XC29QsGWJ31XAmAD0eolHWA61jlFzdixUc2pzWj/8wV/cVdt9re/bPMGYDWxw +WBiDe0DSd4bmpDbKOiX/YP64F/eD22J85+1zL4CNLIToBki1MVEeCbIfKTa3TVU2 +Pm83bUa+s79FZ/3OU/MQF5c3N0M5XDg/E2EGlQnE3iTIgA1fVO13lE3R8KWyt/QN +RPdWyC00ptlBEoS7PFgHe67Ytrkkic2OSqnvMePzIhoWsHbZpRemupbf6+lw6KbB +0Fnzydcmhyqc1B3R3yFw +=JWfg +-----END PGP SIGNATURE----- diff --git a/media-video/handbrake/handbrake-0.10.0-r1.ebuild b/media-video/handbrake/handbrake-0.10.0-r1.ebuild new file mode 100644 index 000000000000..971db3de5c31 --- /dev/null +++ b/media-video/handbrake/handbrake-0.10.0-r1.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.10.0-r1.ebuild,v 1.1 2015/02/01 23:18:38 mgorny Exp $ + +EAPI="5" + +PYTHON_COMPAT=( python2_{6,7} ) + +inherit autotools eutils gnome2-utils python-any-r1 + +if [[ ${PV} = *9999* ]]; then + ESVN_REPO_URI="svn://svn.handbrake.fr/HandBrake/trunk" + inherit subversion + KEYWORDS="" +else + SRC_URI="http://handbrake.fr/rotation.php?file=HandBrake-${PV}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}/HandBrake-${PV}" + 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" + +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-10.1:0= ) + !libav? ( >=media-video/ffmpeg-2.3:0= ) + 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.4 ) + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-lang/yasm + dev-util/intltool + sys-devel/automake" + +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." + + # Remove libdvdnav duplication and call it on the original instead. + # It may work this way; if not, we should try to mimic the duplication. + epatch "${FILESDIR}"/${PN}-9999-remove-dvdnav-dup.patch + + # Remove faac dependency; TODO: figure out if we need to do this at all. + epatch "${FILESDIR}"/${PN}-9999-remove-faac-dependency.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) \ + --disable-x265 || die "Configure failed." + # $(use_enable x265) \ +} + +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 +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild index af2d33d9611f..5c93f3c475b3 100644 --- a/media-video/handbrake/handbrake-9999.ebuild +++ b/media-video/handbrake/handbrake-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.24 2014/12/13 12:15:56 thev00d00 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.25 2015/02/01 23:18:38 mgorny Exp $ EAPI="5" @@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/" LICENSE="GPL-2" SLOT="0" -IUSE="+fdk gstreamer gtk libav-aac" +IUSE="+fdk gstreamer gtk libav libav-aac" REQUIRED_USE="^^ ( fdk libav-aac )" @@ -40,8 +40,9 @@ RDEPEND=" media-libs/libvpx media-libs/x264:= media-sound/lame - || ( >=media-video/libav-10.1 >=media-video/ffmpeg-2.3:0 ) sys-libs/zlib + libav? ( >=media-video/libav-10.1:0= ) + !libav? ( >=media-video/ffmpeg-2.3:0= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 -- 2.26.2