From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9A4F9138A1A for ; Sun, 1 Feb 2015 23:18:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B056E085E; Sun, 1 Feb 2015 23:18:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A211E085E for ; Sun, 1 Feb 2015 23:18:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D4EBF340720 for ; Sun, 1 Feb 2015 23:18:39 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 2279) id 1CF1910DAA; Sun, 1 Feb 2015 23:18:38 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-video/handbrake: handbrake-9999.ebuild handbrake-0.10.0-r1.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: handbrake-9999.ebuild handbrake-0.10.0-r1.ebuild ChangeLog X-VCS-Directories: media-video/handbrake X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20150201231838.1CF1910DAA@oystercatcher.gentoo.org> Date: Sun, 1 Feb 2015 23:18:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9cc0de5c-10ad-418d-a5f2-0a8baa7fae80 X-Archives-Hash: 346cd6d3ee8d2f253638372cc782ac60 mgorny 15/02/01 23:18:38 Modified: handbrake-9999.ebuild ChangeLog Added: handbrake-0.10.0-r1.ebuild Log: Introduce USE=libav to control the preferred implementation. Add subslot op to force rebuilds on ABI change. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) Revision Changes Path 1.25 media-video/handbrake/handbrake-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild?rev=1.25&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild?rev=1.25&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild?r1=1.24&r2=1.25 Index: handbrake-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- handbrake-9999.ebuild 13 Dec 2014 12:15:56 -0000 1.24 +++ handbrake-9999.ebuild 1 Feb 2015 23:18:38 -0000 1.25 @@ -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 @@ 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 @@ 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 1.28 media-video/handbrake/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/ChangeLog?rev=1.28&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/ChangeLog?rev=1.28&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/ChangeLog?r1=1.27&r2=1.28 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- ChangeLog 13 Dec 2014 12:15:56 -0000 1.27 +++ ChangeLog 1 Feb 2015 23:18:38 -0000 1.28 @@ -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: 1.1 media-video/handbrake/handbrake-0.10.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-0.10.0-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-0.10.0-r1.ebuild?rev=1.1&content-type=text/plain Index: handbrake-0.10.0-r1.ebuild =================================================================== # 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 }