* [gentoo-commits] gentoo-x86 commit in media-video/handbrake: handbrake-0.9.9.ebuild ChangeLog handbrake-9999.ebuild
@ 2013-08-11 23:06 Alexis Ballier (aballier)
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-11 23:06 UTC (permalink / raw
To: gentoo-commits
aballier 13/08/11 23:06:03
Modified: handbrake-0.9.9.ebuild ChangeLog
handbrake-9999.ebuild
Log:
write proper ffmpeg/libav deps
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.8 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.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild?r1=1.7&r2=1.8
Index: handbrake-0.9.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- handbrake-0.9.9.ebuild 15 Jul 2013 15:03:54 -0000 1.7
+++ handbrake-0.9.9.ebuild 11 Aug 2013 23:06:02 -0000 1.8
@@ -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.7 2013/07/15 15:03:54 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v 1.8 2013/08/11 23:06:02 aballier Exp $
EAPI="5"
@@ -42,7 +42,7 @@
media-libs/libvorbis
media-libs/x264:=
media-sound/lame
- ffmpeg? ( =virtual/ffmpeg-9 !!<media-video/ffmpeg-1.2.1 )
+ ffmpeg? ( >=media-video/libav-9:= >=media-video/ffmpeg-1.2.1:0= )
sys-libs/zlib
gstreamer? (
media-libs/gstreamer:1.0
1.13 media-video/handbrake/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/ChangeLog?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/ChangeLog?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/ChangeLog?r1=1.12&r2=1.13
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ChangeLog 15 Jul 2013 15:03:54 -0000 1.12
+++ ChangeLog 11 Aug 2013 23:06:02 -0000 1.13
@@ -1,6 +1,10 @@
# 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.12 2013/07/15 15:03:54 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.13 2013/08/11 23:06:02 aballier Exp $
+
+ 11 Aug 2013; Alexis Ballier <aballier@gentoo.org> handbrake-0.9.9.ebuild,
+ handbrake-9999.ebuild:
+ write proper ffmpeg/libav deps
15 Jul 2013; Tom Wijsman <TomWij@gentoo.org>
+files/handbrake-0.9.9-remove-faac-dependency.patch,
1.10 media-video/handbrake/handbrake-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild?r1=1.9&r2=1.10
Index: handbrake-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- handbrake-9999.ebuild 15 Jul 2013 15:03:54 -0000 1.9
+++ handbrake-9999.ebuild 11 Aug 2013 23:06:03 -0000 1.10
@@ -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.9 2013/07/15 15:03:54 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.10 2013/08/11 23:06:03 aballier Exp $
EAPI="5"
@@ -50,7 +50,7 @@
media-libs/libvorbis
media-libs/x264:=
media-sound/lame
- ffmpeg? ( =virtual/ffmpeg-9 !<media-video/ffmpeg-1.2.1 )
+ ffmpeg? ( >=media-video/libav-9:= >=media-video/ffmpeg-1.2.1:0= )
sys-libs/zlib
gstreamer? (
media-libs/gstreamer:1.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/handbrake: handbrake-0.9.9.ebuild ChangeLog handbrake-9999.ebuild
@ 2013-09-16 12:42 Tom Wijsman (tomwij)
0 siblings, 0 replies; 2+ messages in thread
From: Tom Wijsman (tomwij) @ 2013-09-16 12:42 UTC (permalink / raw
To: gentoo-commits
tomwij 13/09/16 12:42:29
Modified: handbrake-0.9.9.ebuild ChangeLog
handbrake-9999.ebuild
Log:
Added gmodule to linker command line, fixes bug #482674 reported by Neil. Repaired handbrake-9999-remove-faac-dependency.patch, fixes bug #484234 reported by Piotr Mitas. The live version still fails due to missing ff_cpu_cpuid, likely needs newer (masked) ffmpeg to proceed.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path
1.11 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.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild?r1=1.10&r2=1.11
Index: handbrake-0.9.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- handbrake-0.9.9.ebuild 5 Sep 2013 18:58:06 -0000 1.10
+++ handbrake-0.9.9.ebuild 16 Sep 2013 12:42:28 -0000 1.11
@@ -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.10 2013/09/05 18:58:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v 1.11 2013/09/16 12:42:28 tomwij Exp $
EAPI="5"
@@ -80,24 +80,27 @@
|| die "Contrib removal failed."
# Instead of adding a #define to libmkv, we expand it in place.
- epatch "${FILESDIR}"/handbrake-9999-expand-MK_SUBTITLE_PGS.patch
+ epatch "${FILESDIR}"/${PN}-9999-expand-MK_SUBTITLE_PGS.patch
# Fix compilation against the released 1.9.1 version of mp4v2.
- epatch "${FILESDIR}"/handbrake-9999-fix-compilation-with-mp4v2-v1.9.1.patch
+ epatch "${FILESDIR}"/${PN}-9999-fix-compilation-with-mp4v2-v1.9.1.patch
# 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}"/handbrake-9999-remove-dvdnav-dup.patch
+ epatch "${FILESDIR}"/${PN}-9999-remove-dvdnav-dup.patch
# Remove faac dependency until its compilation errors can be resolved.
epatch "${FILESDIR}"/${P}-remove-faac-dependency.patch
sed -i 's/-lfaac//' gtk/configure.ac || die
# Make use of an older version of libmkv.
- epatch "${FILESDIR}"/handbrake-9999-use-older-libmkv.patch
+ epatch "${FILESDIR}"/${PN}-9999-use-older-libmkv.patch
# Make use of an unpatched version of a52 that does not make a private field public.
- epatch "${FILESDIR}"/handbrake-9999-use-unpatched-a52.patch
+ epatch "${FILESDIR}"/${PN}-9999-use-unpatched-a52.patch
+
+ # Add gmodule to the linker command line for bug #482674.
+ epatch "${FILESDIR}"/${P}-add-gmodule-to-gtk-configure.patch
# Fixup configure.ac with newer automake
cd "${S}/gtk"
1.16 media-video/handbrake/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/ChangeLog?r1=1.15&r2=1.16
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog 5 Sep 2013 18:58:06 -0000 1.15
+++ ChangeLog 16 Sep 2013 12:42:28 -0000 1.16
@@ -1,6 +1,15 @@
# 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.15 2013/09/05 18:58:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.16 2013/09/16 12:42:28 tomwij Exp $
+
+ 16 Sep 2013; Tom Wijsman <TomWij@gentoo.org>
+ +files/handbrake-0.9.9-add-gmodule-to-gtk-configure.patch,
+ files/handbrake-9999-remove-faac-dependency.patch, handbrake-0.9.9.ebuild,
+ handbrake-9999.ebuild:
+ Added gmodule to linker command line, fixes bug #482674 reported by Neil.
+ Repaired handbrake-9999-remove-faac-dependency.patch, fixes bug #484234
+ reported by Piotr Mitas. The live version still fails due to missing
+ ff_cpu_cpuid, likely needs newer (masked) ffmpeg to proceed.
05 Sep 2013; Michał Górny <mgorny@gentoo.org> handbrake-0.9.9.ebuild,
handbrake-9999.ebuild:
1.13 media-video/handbrake/handbrake-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild?r1=1.12&r2=1.13
Index: handbrake-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- handbrake-9999.ebuild 5 Sep 2013 18:58:06 -0000 1.12
+++ handbrake-9999.ebuild 16 Sep 2013 12:42:28 -0000 1.13
@@ -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.12 2013/09/05 18:58:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.13 2013/09/16 12:42:28 tomwij Exp $
EAPI="5"
@@ -90,25 +90,28 @@
|| die "Contrib removal failed."
# Instead of adding a #define to libmkv, we expand it in place.
- epatch "${FILESDIR}"/handbrake-9999-expand-MK_SUBTITLE_PGS.patch
+ epatch "${FILESDIR}"/${PN}-9999-expand-MK_SUBTITLE_PGS.patch
# Fix compilation against the released 1.9.1 version of mp4v2.
- epatch "${FILESDIR}"/handbrake-9999-fix-compilation-with-mp4v2-v1.9.1.patch
+ epatch "${FILESDIR}"/${PN}-9999-fix-compilation-with-mp4v2-v1.9.1.patch
# 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}"/handbrake-9999-remove-dvdnav-dup.patch
+ epatch "${FILESDIR}"/${PN}-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
+ epatch "${FILESDIR}"/${PN}-9999-remove-faac-dependency.patch
# Make use of an older version of libmkv.
- epatch "${FILESDIR}"/handbrake-9999-use-older-libmkv.patch
+ epatch "${FILESDIR}"/${PN}-9999-use-older-libmkv.patch
# Make use of an unpatched version of a52 that does not make a private field public.
- epatch "${FILESDIR}"/handbrake-9999-use-unpatched-a52.patch
+ epatch "${FILESDIR}"/${PN}-9999-use-unpatched-a52.patch
+
+ # Add gmodule to the linker command line for bug #482674.
+ epatch "${FILESDIR}"/${PN}-0.9.9-add-gmodule-to-gtk-configure.patch
# Fixup configure.ac with newer automake.
# TODO: Would like to see this shorten towards the future;
@@ -147,8 +150,7 @@
$(use_enable fdk fdk-aac) \
$(use_enable ffmpeg ff-mpeg2) \
$(use_enable gtk) \
- $(use_enable gstreamer gst) \
- ${myconf} || die "Configure failed."
+ $(usex !gstreamer --disable-gst) || die "Configure failed."
}
src_compile() {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-09-16 12:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-16 12:42 [gentoo-commits] gentoo-x86 commit in media-video/handbrake: handbrake-0.9.9.ebuild ChangeLog handbrake-9999.ebuild Tom Wijsman (tomwij)
-- strict thread matches above, loose matches on Subject: below --
2013-08-11 23:06 Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox