Add mp3, x264 patches from upstream, bug 158448

Package-Manager: portage-2.1.1-r2

6 files changed, 144 insertions, 15 deletions

diff --git a/media-video/ogmrip/ChangeLog b/media-video/ogmrip/ChangeLog
index 3ebb7261572e..b689dbfdec8a 100644
--- a/media-video/ogmrip/ChangeLog
+++ b/media-video/ogmrip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/ogmrip
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.18 2006/11/11 22:07:12 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.19 2006/12/19 14:12:23 beandog Exp $
+
+*ogmrip-0.10.0-r2 (19 Dec 2006)
+
+  19 Dec 2006; Steve Dibb <beandog@gentoo.org>
+  +files/ogmrip-0.10.0-mp3-quality.patch,
+  +files/ogmrip-0.10.0-x264-suboptions.patch, +ogmrip-0.10.0-r2.ebuild:
+  Add mp3, x264 patches from upstream, bug 158448
 
   11 Nov 2006; Francesco Riosa <vivo@gentoo.org> ogmrip-0.10.0-r1.ebuild:
   FILESDIR => DISTDIR for the patch
diff --git a/media-video/ogmrip/Manifest b/media-video/ogmrip/Manifest
index 06deced08874..dcfb937f9db4 100644
--- a/media-video/ogmrip/Manifest
+++ b/media-video/ogmrip/Manifest
@@ -1,20 +1,29 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ogmrip-0.10.0-mp3-quality.patch 616 RMD160 9ababe3e2eb54f523ecd5089d0dc36987c90ad35 SHA1 d2695d5528fb948e761362fdfdeba43338af7618 SHA256 75dd92c2960273da1427db09c4e033a02e23fc7d4ffb117f8f38aba535ef3dbe
+MD5 cfa027fb798ba4963aeb099e08519c18 files/ogmrip-0.10.0-mp3-quality.patch 616
+RMD160 9ababe3e2eb54f523ecd5089d0dc36987c90ad35 files/ogmrip-0.10.0-mp3-quality.patch 616
+SHA256 75dd92c2960273da1427db09c4e033a02e23fc7d4ffb117f8f38aba535ef3dbe files/ogmrip-0.10.0-mp3-quality.patch 616
+AUX ogmrip-0.10.0-x264-suboptions.patch 1396 RMD160 879481200ba6e0e101eccb88cecf4c73342f39ad SHA1 6ec42bd4ef6d32d89971d7de2c49b26076011114 SHA256 8acdadab670522ad9dace44d99837c6dacc744bf840f51e8a6da69ddfbbec665
+MD5 69374235bf8f0275298f7f48d945977a files/ogmrip-0.10.0-x264-suboptions.patch 1396
+RMD160 879481200ba6e0e101eccb88cecf4c73342f39ad files/ogmrip-0.10.0-x264-suboptions.patch 1396
+SHA256 8acdadab670522ad9dace44d99837c6dacc744bf840f51e8a6da69ddfbbec665 files/ogmrip-0.10.0-x264-suboptions.patch 1396
 DIST ogmrip-0.10.0-mplayer-rc.patch 26116 RMD160 b58ae47ad5336fa92d09e2e147829a7ace58c3be SHA1 f0e66993ff39c737bfdbe99a4dde79c54c1614c7 SHA256 208c5c1f49ba067aec4e64e7091ed3d8ac6ea0dcfecf4c2b93c483e90005d585
 DIST ogmrip-0.10.0.tar.gz 623001 RMD160 d639a2adb7a3008db1f72f9d82c0c9591393bf80 SHA1 7244d56d9c216ef0e6ab91e685d8e65ecc2774e3 SHA256 5b3d27b64ce07e99c407bd71de2dbb5d01de4ce2debcd74913ac7201976981ce
 EBUILD ogmrip-0.10.0-r1.ebuild 1896 RMD160 a60f5b79ab3bcab1f3b99723086bac8d1448a820 SHA1 c6ee0030d6b0922a48bab4ad22aecf2f294f38fe SHA256 798a140899ce9dd69c19f93441cf49c2b724df4fd77e1768bfbb3af75954b8b1
 MD5 e9217011b82f3ba8f6829ac00d7fa582 ogmrip-0.10.0-r1.ebuild 1896
 RMD160 a60f5b79ab3bcab1f3b99723086bac8d1448a820 ogmrip-0.10.0-r1.ebuild 1896
 SHA256 798a140899ce9dd69c19f93441cf49c2b724df4fd77e1768bfbb3af75954b8b1 ogmrip-0.10.0-r1.ebuild 1896
+EBUILD ogmrip-0.10.0-r2.ebuild 2006 RMD160 2309058f967758b404753cf0ea2e26772e840e0c SHA1 22af94dfdca44d338fe5c26978d6ce2daf934e7e SHA256 c946df2b287cc2bdab7183c2d269733ae7aaffe9d0d7b1da9ba18e2b93f1c759
+MD5 8d8980ff3ecfd5496b78a2b61376e0e1 ogmrip-0.10.0-r2.ebuild 2006
+RMD160 2309058f967758b404753cf0ea2e26772e840e0c ogmrip-0.10.0-r2.ebuild 2006
+SHA256 c946df2b287cc2bdab7183c2d269733ae7aaffe9d0d7b1da9ba18e2b93f1c759 ogmrip-0.10.0-r2.ebuild 2006
 EBUILD ogmrip-0.10.0.ebuild 1754 RMD160 0be8bda3080683ab5cec88f87d71d9e5d6a6e803 SHA1 45bef5570a58cbf2e0e137a62640ad56d8f7c07b SHA256 1e86f22656f6d113865b12fee37d7c1990084cdd3996c473eac719ed5379de34
 MD5 47c435e98092455d8d7f92615733557b ogmrip-0.10.0.ebuild 1754
 RMD160 0be8bda3080683ab5cec88f87d71d9e5d6a6e803 ogmrip-0.10.0.ebuild 1754
 SHA256 1e86f22656f6d113865b12fee37d7c1990084cdd3996c473eac719ed5379de34 ogmrip-0.10.0.ebuild 1754
-MISC ChangeLog 3929 RMD160 b0466d472a795b585065ff9a7bf74b57141b443e SHA1 09e01c0f694e379505fb176a52e0d34102f1670d SHA256 80ea5dadb55207fa7681b8151bec79c547950503dc935d3c7b7afde0cf8c138c
-MD5 6c0f10ffe01caadc476f400c705d42ff ChangeLog 3929
-RMD160 b0466d472a795b585065ff9a7bf74b57141b443e ChangeLog 3929
-SHA256 80ea5dadb55207fa7681b8151bec79c547950503dc935d3c7b7afde0cf8c138c ChangeLog 3929
+MISC ChangeLog 4177 RMD160 354d15885aca4e03b2ad16e0e1819a4008fc14c0 SHA1 994b4b9bc53dc54ed9bc433c1cf318d0462bca64 SHA256 7a50ae5f1d1c406c78bc75d09b287296a256befa6b787a1f808918ea00f64575
+MD5 e1c281917b1c7d1eaa1911f576a4abf7 ChangeLog 4177
+RMD160 354d15885aca4e03b2ad16e0e1819a4008fc14c0 ChangeLog 4177
+SHA256 7a50ae5f1d1c406c78bc75d09b287296a256befa6b787a1f808918ea00f64575 ChangeLog 4177
 MISC metadata.xml 380 RMD160 d2b63fc7b96b0de1978f06fd8f70a8a55f9c80e7 SHA1 8709d1b5015b382503025066890eecee94efffc7 SHA256 70617929adf4909735883031a2a9c86ea5e808f4bee7037ecca3c490d68c74bd
 MD5 949f6911677e3fd917e59df12a09905c metadata.xml 380
 RMD160 d2b63fc7b96b0de1978f06fd8f70a8a55f9c80e7 metadata.xml 380
@@ -25,10 +34,6 @@ SHA256 b90b3e0ef04239ab1daac6b92a950f51ac3d2677cda5d309022f05dcaeee2843 files/di
 MD5 b75e918d4d0122e2b84dd06c67181aa2 files/digest-ogmrip-0.10.0-r1 509
 RMD160 334a562b6be8e4588a83ba686f2a697b07f2535e files/digest-ogmrip-0.10.0-r1 509
 SHA256 4e8eaafa05d6a20cd818620b50db33dc478b79eb3b6107c07dfb1fdecaf7dcb9 files/digest-ogmrip-0.10.0-r1 509
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFVkrRKolR564NvWYRArxuAKCzgSCOxyXc1dEsyFuaGLFgCvUd0ACfda/M
-CfT6zzPtJEeUWYyP4MIzhvg=
-=1fQX
------END PGP SIGNATURE-----
+MD5 b75e918d4d0122e2b84dd06c67181aa2 files/digest-ogmrip-0.10.0-r2 509
+RMD160 334a562b6be8e4588a83ba686f2a697b07f2535e files/digest-ogmrip-0.10.0-r2 509
+SHA256 4e8eaafa05d6a20cd818620b50db33dc478b79eb3b6107c07dfb1fdecaf7dcb9 files/digest-ogmrip-0.10.0-r2 509
diff --git a/media-video/ogmrip/files/digest-ogmrip-0.10.0-r2 b/media-video/ogmrip/files/digest-ogmrip-0.10.0-r2
new file mode 100644
index 000000000000..64a0e494948d
--- /dev/null
+++ b/media-video/ogmrip/files/digest-ogmrip-0.10.0-r2
@@ -0,0 +1,6 @@
+MD5 998d0404e0f50897e3ac0363e08b3a91 ogmrip-0.10.0-mplayer-rc.patch 26116
+RMD160 b58ae47ad5336fa92d09e2e147829a7ace58c3be ogmrip-0.10.0-mplayer-rc.patch 26116
+SHA256 208c5c1f49ba067aec4e64e7091ed3d8ac6ea0dcfecf4c2b93c483e90005d585 ogmrip-0.10.0-mplayer-rc.patch 26116
+MD5 cef80b77b551a6e7accc1441b62c1b4a ogmrip-0.10.0.tar.gz 623001
+RMD160 d639a2adb7a3008db1f72f9d82c0c9591393bf80 ogmrip-0.10.0.tar.gz 623001
+SHA256 5b3d27b64ce07e99c407bd71de2dbb5d01de4ce2debcd74913ac7201976981ce ogmrip-0.10.0.tar.gz 623001
diff --git a/media-video/ogmrip/files/ogmrip-0.10.0-mp3-quality.patch b/media-video/ogmrip/files/ogmrip-0.10.0-mp3-quality.patch
new file mode 100644
index 000000000000..fdd132e217bc
--- /dev/null
+++ b/media-video/ogmrip/files/ogmrip-0.10.0-mp3-quality.patch
@@ -0,0 +1,13 @@
+=== libogmrip/ogmrip-backend.c
+==================================================================
+--- libogmrip/ogmrip-backend.c	(revision 800)
++++ libogmrip/ogmrip-backend.c	(local)
+@@ -694,7 +694,7 @@
+   g_ptr_array_add (argv, g_strdup_printf ("%d", ogmrip_audio_get_sample_rate (audio) / 1000));
+   g_ptr_array_add (argv, g_strdup ("--preset"));
+   g_ptr_array_add (argv, g_strdup (presets[quality][0]));
+-  if (presets[quality][2])
++  if (presets[quality][1])
+     g_ptr_array_add (argv, g_strdup (presets[quality][1]));
+   g_ptr_array_add (argv, g_strdup (input));
+   g_ptr_array_add (argv, g_strdup (output));
diff --git a/media-video/ogmrip/files/ogmrip-0.10.0-x264-suboptions.patch b/media-video/ogmrip/files/ogmrip-0.10.0-x264-suboptions.patch
new file mode 100644
index 000000000000..5a5dec8f3998
--- /dev/null
+++ b/media-video/ogmrip/files/ogmrip-0.10.0-x264-suboptions.patch
@@ -0,0 +1,33 @@
+--- libogmrip/ogmrip-backend.c.orig	2006-11-20 13:10:26.000000000 +0100
++++ libogmrip/ogmrip-backend.c	2006-11-20 13:12:30.000000000 +0100
+@@ -48,12 +48,15 @@
+ #define OGMRIP_LAVC_VERY_HIGH_OPTIONS "vcodec=mpeg4:autoaspect:mbd=2:vb_strategy=1:last_pred=3:mv0:preme=2:qns=2"
+ #define OGMRIP_LAVC_HIGH_OPTIONS      "vcodec=mpeg4:autoaspect:mbd=2:vb_strategy=1:last_pred=2:vqcomp=0.6"
+ #define OGMRIP_LAVC_FAST_OPTIONS      "vcodec=mpeg4:autoaspect:mbd=2"
+-/*
+-#define OGMRIP_X264_VERY_HIGH_OPTIONS "subq=6:b_pyramid:weight_b:8x8dct:frameref=5:me=3"
++
++#if MPLAYER_CHECK_VERSION(1,0,1,0)
++#define OGMRIP_X264_VERY_HIGH_OPTIONS "subq=6:b_pyramid:weight_b:8x8dct:frameref=5:me=umh"
+ #define OGMRIP_X264_HIGH_OPTIONS      "subq=5:b_pyramid:weight_b:8x8dct:frameref=2"
+-*/
++#else
+ #define OGMRIP_X264_VERY_HIGH_OPTIONS "subq=6:b_pyramid:weight_b:frameref=5:me=3"
+ #define OGMRIP_X264_HIGH_OPTIONS      "subq=5:b_pyramid:weight_b:frameref=2"
++#endif
++
+ #define OGMRIP_X264_FAST_OPTIONS      "subq=4:b_pyramid:weight_b"
+ 
+ #if MPLAYER_CHECK_VERSION(1,0,0,8)
+@@ -1141,7 +1144,11 @@
+ #endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */
+ 
+   if (ogmrip_video_get_4mv (video))
++#if MPLAYER_CHECK_VERSION(1,0,0,8)
++    g_string_append (options, ":partitions=p4x4");
++#else
+     g_string_append (options, ":4x4mv");
++#endif
+   if (ogmrip_video_get_trellis (video))
+     g_string_append (options, ":trellis=1");
+   else
diff --git a/media-video/ogmrip/ogmrip-0.10.0-r2.ebuild b/media-video/ogmrip/ogmrip-0.10.0-r2.ebuild
new file mode 100644
index 000000000000..4ced545150c7
--- /dev/null
+++ b/media-video/ogmrip/ogmrip-0.10.0-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.10.0-r2.ebuild,v 1.1 2006/12/19 14:12:23 beandog Exp $
+
+inherit gnome2 eutils autotools gnome2-utils
+
+DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
+HOMEPAGE="http://ogmrip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/${PN}-0.10.0-mplayer-rc.patch"
+LICENSE="LGPL-2.1"
+
+SLOT="0"
+IUSE="aac debug doc gtk hal matroska spell srt theora"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=dev-libs/glib-2.6
+	>=dev-libs/libxml2-2
+	>=media-libs/libdvdread-0.9.4
+	>=media-sound/lame-3.96
+	>=media-sound/ogmtools-1.4
+	>=media-sound/vorbis-tools-1.0
+	>=media-video/mplayer-1.0_pre4
+	aac? ( >=media-libs/faac-1.24 )
+	gtk? ( >=x11-libs/gtk+-2.6
+		>=gnome-base/gconf-2.6
+		>=gnome-base/libglade-2.5 )
+	hal? ( >=sys-apps/hal-0.4.2 )
+	matroska? ( >=media-video/mkvtoolnix-0.9 )
+	spell? ( >=app-text/enchant-1.1 )
+	srt? ( >=app-text/gocr-0.39 )
+	theora? ( >=media-libs/libtheora-1.0_alpha6 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.12.0"
+
+G2CONF="${G2CONF}
+	$(use_enable aac aac-support)
+	$(use_enable debug maintainer-mode)
+	$(use_enable gtk gtk-support)
+	$(use_enable hal hal-support)
+	$(use_enable matroska matroska-support)
+	$(use_enable spell enchant-support)
+	$(use_enable srt srt-support)
+	$(use_enable theora theora-support)"
+
+DOCS="AUTHORS ChangeLog README NEWS TODO"
+
+pkg_setup() {
+	if ! built_with_use -a media-video/mplayer dvd encode xvid; then
+		eerror "Please, check that your USE flags contain 'dvd', 'encode' and"
+		eerror "'xvid' and emerge mplayer again."
+		die "MPlayer is not built with dvd, encoding or xvid support."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${DISTDIR}/${P}-mplayer-rc.patch"
+	epatch "${FILESDIR}/${P}-mp3-quality.patch"
+	epatch "${FILESDIR}/${P}-x264-suboptions.patch"
+	eautoreconf
+}