* [gentoo-commits] gentoo-x86 commit in media-video/handbrake: handbrake-0.9.9.ebuild handbrake-9999.ebuild ChangeLog handbrake-0.9.9_pre5441-r1.ebuild
@ 2013-07-15 15:03 Tom Wijsman (tomwij)
0 siblings, 0 replies; only message in thread
From: Tom Wijsman (tomwij) @ 2013-07-15 15:03 UTC (permalink / raw
To: gentoo-commits
tomwij 13/07/15 15:03:54
Modified: handbrake-0.9.9.ebuild handbrake-9999.ebuild
ChangeLog
Removed: handbrake-0.9.9_pre5441-r1.ebuild
Log:
Fix faac dependency removal patch for handbrake-9999, currently it still fails to build due to a yasm based cpuid detection they introduced that doesn't appear to work; also heavily documented that ebuild with TODOs that would be nice to have for the upcoming release. Fixed up src_configure a bit. Removed old snapshot version 0.9.9_pre5441-r1.
(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path
1.7 media-video/handbrake/handbrake-0.9.9.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild?r1=1.6&r2=1.7
Index: handbrake-0.9.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- handbrake-0.9.9.ebuild 7 Jul 2013 13:05:13 -0000 1.6
+++ handbrake-0.9.9.ebuild 15 Jul 2013 15:03:54 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v 1.6 2013/07/07 13:05:13 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v 1.7 2013/07/15 15:03:54 tomwij Exp $
EAPI="5"
@@ -90,7 +90,7 @@
epatch "${FILESDIR}"/handbrake-9999-remove-dvdnav-dup.patch
# Remove faac dependency until its compilation errors can be resolved.
- epatch "${FILESDIR}"/handbrake-9999-remove-faac-dependency.patch
+ epatch "${FILESDIR}"/${P}-remove-faac-dependency.patch
sed -i 's/-lfaac//' gtk/configure.ac || die
# Make use of an older version of libmkv.
1.9 media-video/handbrake/handbrake-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild?r1=1.8&r2=1.9
Index: handbrake-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- handbrake-9999.ebuild 7 Jul 2013 13:05:13 -0000 1.8
+++ handbrake-9999.ebuild 15 Jul 2013 15:03:54 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.8 2013/07/07 13:05:13 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.9 2013/07/15 15:03:54 tomwij Exp $
EAPI="5"
@@ -8,6 +8,9 @@
inherit autotools eutils gnome2-utils python-any-r1
+# TODO: Are KEYWORDS like these stabilization script friendly?
+# We can opt to move the KEYWORDS from the else before the if;
+# that way, it is listed first and the 9999 version will set it to "".
if [[ ${PV} = *9999* ]]; then
ESVN_REPO_URI="svn://svn.handbrake.fr/HandBrake/trunk"
inherit subversion
@@ -28,8 +31,13 @@
# Use either ffmpeg or gst-plugins/mpeg2dec for decoding MPEG-2.
REQUIRED_USE="!ffmpeg? ( gstreamer )"
+# TODO: As we improve src_configure with more flags we can make more optional here.
+# Besides that, we should list slots for all the dependencies as well as
+# support sub slot rebuilds where they are still missing; lets avoid running
+# into more problems while we can.
RDEPEND="
media-libs/a52dec
+ media-libs/faac
media-libs/libass
media-libs/libbluray
media-libs/libdvdnav
@@ -75,6 +83,8 @@
src_prepare() {
# Get rid of leftover bundled library build definitions,
# the version 0.9.9 supports the use of system libraries.
+ # TODO: Is this still needed, does this sed still do something?
+ # If it does; we should convert this into a patch, such that we know it fails.
sed -i 's:.*\(/contrib\|contrib/\).*::g' \
"${S}"/make/include/main.defs \
|| die "Contrib removal failed."
@@ -90,6 +100,8 @@
epatch "${FILESDIR}"/handbrake-9999-remove-dvdnav-dup.patch
# Remove faac dependency until its compilation errors can be resolved.
+ # TODO: If --disable-faac works then this patch can be removed;
+ # we also need to figure out if this is still needed, maybe things are patched.
epatch "${FILESDIR}"/handbrake-9999-remove-faac-dependency.patch
# Make use of an older version of libmkv.
@@ -98,7 +110,9 @@
# Make use of an unpatched version of a52 that does not make a private field public.
epatch "${FILESDIR}"/handbrake-9999-use-unpatched-a52.patch
- # Fixup configure.ac with newer automake
+ # Fixup configure.ac with newer automake.
+ # TODO: Would like to see this shorten towards the future;
+ # see which are still needed, put those in a patch instead of 6 lines here.
cd "${S}/gtk"
sed -i \
-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
@@ -106,41 +120,41 @@
-e 's:am_cv_prog_cc_stdc:ac_cv_prog_cc_stdc:g' \
configure.ac || die "Fixing up configure.ac failed"
- # Don't run autogen.sh
+ # Don't run autogen.sh.
+ # TODO: Document why we're not running this.
sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+
eautoreconf
}
src_configure() {
- local myconf=""
-
- if ! use gtk ; then
- myconf+=" --disable-gtk"
- fi
-
- if ! use gstreamer ; then
- myconf+=" --disable-gst"
- fi
-
- if use ffmpeg ; then
- myconf+=" --enable-ff-mpeg2"
- fi
-
- if use fdk ; then
- myconf+=" --enable-fdk-aac"
- fi
-
+ # TODO: Try to make parameters avformat, libav-aac, libmkv, mp4v2 optional
+ # as for making faac optional, see the above TODO first.
+ #
+ # Just to be sure, check the ./configure --help before each release;
+ # they are still in the progress of unbundling / making things optional.
+ #
+ # Check if the Python-ish implementation supports econf style.
./configure \
--force \
--prefix="${EPREFIX}/usr" \
--disable-gtk-update-checks \
+ --disable-faac \
+ --enable-avformat \
+ --disable-libav-aac \
+ --enable-libmkv \
+ --enable-mp4v2 \
+ $(use_enable fdk fdk-aac) \
+ $(use_enable ffmpeg ff-mpeg2) \
+ $(use_enable gtk) \
+ $(use_enable gstreamer gst) \
${myconf} || die "Configure failed."
}
src_compile() {
emake -C build
- # Documentation building is currently broken.
+ # TODO: Documentation building is currently broken, try to fix it.
#
# if use doc ; then
# emake -C build doc
1.12 media-video/handbrake/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/ChangeLog?r1=1.11&r2=1.12
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog 7 Jul 2013 13:05:13 -0000 1.11
+++ ChangeLog 15 Jul 2013 15:03:54 -0000 1.12
@@ -1,6 +1,17 @@
# ChangeLog for media-video/handbrake
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.11 2013/07/07 13:05:13 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.12 2013/07/15 15:03:54 tomwij Exp $
+
+ 15 Jul 2013; Tom Wijsman <TomWij@gentoo.org>
+ +files/handbrake-0.9.9-remove-faac-dependency.patch,
+ -handbrake-0.9.9_pre5441-r1.ebuild,
+ files/handbrake-9999-remove-faac-dependency.patch, handbrake-0.9.9.ebuild,
+ handbrake-9999.ebuild:
+ Fix faac dependency removal patch for handbrake-9999, currently it still fails
+ to build due to a yasm based cpuid detection they introduced that doesn't
+ appear to work; also heavily documented that ebuild with TODOs that would be
+ nice to have for the upcoming release. Fixed up src_configure a bit. Removed
+ old snapshot version 0.9.9_pre5441-r1.
07 Jul 2013; Tom Wijsman <TomWij@gentoo.org> handbrake-0.9.9.ebuild,
handbrake-9999.ebuild:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-07-15 15:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-15 15:03 [gentoo-commits] gentoo-x86 commit in media-video/handbrake: handbrake-0.9.9.ebuild handbrake-9999.ebuild ChangeLog handbrake-0.9.9_pre5441-r1.ebuild Tom Wijsman (tomwij)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox