Add patch fixing usage with new libtheora. Revbump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 104 insertions, 2 deletions

diff --git a/media-video/recordmydesktop/ChangeLog b/media-video/recordmydesktop/ChangeLog
index 47f08b1cf934..96ef351a7ab6 100644
--- a/media-video/recordmydesktop/ChangeLog
+++ b/media-video/recordmydesktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/recordmydesktop
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/recordmydesktop/ChangeLog,v 1.29 2010/01/04 14:29:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/recordmydesktop/ChangeLog,v 1.30 2010/03/25 12:29:41 scarabeus Exp $
+
+*recordmydesktop-0.3.8.1-r2 (25 Mar 2010)
+
+  25 Mar 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/0.3.8.1-fix_new_theora.patch, +recordmydesktop-0.3.8.1-r2.ebuild:
+  Add patch fixing usage with new libtheora. Revbump.
 
 *recordmydesktop-0.3.8.1-r1 (04 Jan 2010)
 
diff --git a/media-video/recordmydesktop/Manifest b/media-video/recordmydesktop/Manifest
index 258c1a2f8acf..50a65a125991 100644
--- a/media-video/recordmydesktop/Manifest
+++ b/media-video/recordmydesktop/Manifest
@@ -1,5 +1,7 @@
+AUX 0.3.8.1-fix_new_theora.patch 1779 RMD160 84e2196a47e00d5837ef9891ab59b70a017bae46 SHA1 bcdf77e6c38b230f3587f76e9ac6a7047ff28fcb SHA256 f3d2ce95ca88d20e15bf1d4e77ab9b7e3c73c5c97b052575757b3905bbcb5fb5
 DIST recordmydesktop-0.3.8.1.tar.gz 198732 RMD160 a942e16ab9714861010a34a921f8b2127792bd29 SHA1 4be18baa70da88a7f228591057f2e7ff51b31de4 SHA256 33a2e208186ae78e2db2a27b0f5047b50fb7819c47fe15483b0765200b9d738c
 EBUILD recordmydesktop-0.3.8.1-r1.ebuild 1197 RMD160 44ac78eaecd85bcbcc36f00cd92a60de7dcee97c SHA1 1555c6736a5023a3726d22579b9d331b7276d3db SHA256 d2a7f24f925af5d422b93f2361f0d6acfb6a2f792b77f77069bb646393ffa201
+EBUILD recordmydesktop-0.3.8.1-r2.ebuild 1293 RMD160 b597db4bed71bee7e2c20ad0b6019b012b7ba546 SHA1 8f3c7fc647dd3cd03f84db9991f10cd5ed3b2ff6 SHA256 514d6a2355b18c39e7fdb139a7346b2ef9717cb6879e30804a29c55e7c3712f8
 EBUILD recordmydesktop-0.3.8.1.ebuild 948 RMD160 29f44db561679ab91013361d2cc47968f6016785 SHA1 5fda2b66febdddfa784cf9f4d14fbd69f521cb69 SHA256 e155276e5c2d6a287c17362a69d99d7d5247155cae207a2f0a67ff5bdcec3f1e
-MISC ChangeLog 4527 RMD160 b26519515ca47a154322ca5531896dd9ebd9d537 SHA1 a25b0b4b0c9c71973ec4e6dc49617cd36b8e64fe SHA256 d9fec30b6407deb0d2e3916be8254206072a1871fbbad7cafea93d94a027421f
+MISC ChangeLog 4755 RMD160 45980a32f8882ee9ea3adb603fdb661df70ded9c SHA1 96044016e3fc40c8d458b82b7a89354eea8feb85 SHA256 30f3fecd192c34bc5abe857bc29e0cca32b2b0c7fe7842d086212bdfc850aeac
 MISC metadata.xml 226 RMD160 9acecdf92471eb50a25bc1aaf0d5179959d6d211 SHA1 f66369c7e7900801781a598bf5a7e6e49803a801 SHA256 b159adc5c7076105f4bc05f02d3c1e12bcad82faedf5df5ba4888077732ebf64
diff --git a/media-video/recordmydesktop/files/0.3.8.1-fix_new_theora.patch b/media-video/recordmydesktop/files/0.3.8.1-fix_new_theora.patch
new file mode 100644
index 000000000000..f543f4676a34
--- /dev/null
+++ b/media-video/recordmydesktop/files/0.3.8.1-fix_new_theora.patch
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix_new_theora.dpatch by  <root@localhost>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix recording with newest libtheora versions
+
+@DPATCH@
+
+--- recordmydesktop-0.3.8.1+svn602.orig/src/rmd_initialize_data.c	2010-02-08 18:30:42.000000000 +0100
++++ recordmydesktop-0.3.8.1+svn602.bueno/src/rmd_initialize_data.c	2010-02-08 19:12:36.000000000 +0100
+@@ -223,7 +223,7 @@
+     args->channels             = 1;
+     args->frequency            = 22050;
+     args->buffsize             = 4096;
+-    args->v_bitrate            = 45000;
++    args->v_bitrate            = 0;
+     args->v_quality            = 63;
+     args->s_quality            = 10;
+ 
+@DPATCH@
+
+--- recordmydesktop-0.3.8.1+svn602.orig/src/rmd_parseargs.c	2010-02-08 18:30:42.000000000 +0100
++++ recordmydesktop-0.3.8.1+svn602.bueno/src/rmd_parseargs.c	2010-02-08 19:15:01.000000000 +0100
+@@ -215,7 +215,7 @@
+ 
+         { "v_bitrate", '\0',
+           POPT_ARG_INT, &arg_return->v_bitrate, 0,
+-          "A number from 45000 to 2000000 for desired encoded video bitrate(default 45000).",
++          "A number from 0 to 2000000 for desired encoded video bitrate(default 0).",
+           "n" },
+ 
+         { "s_quality", '\0',
+@@ -460,8 +460,8 @@
+         fprintf(stdout, "--v_quality must be within the inclusive range [0-63].\n");
+         success = FALSE;
+     }
+-    if (args->v_bitrate < 45000 || args->v_quality > 2000000) {
+-        fprintf(stdout, "--v_bitrate must be within the inclusive range [45000-2000000].\n");
++    if (args->v_bitrate < 0 || args->v_quality > 2000000) {
++        fprintf(stdout, "--v_bitrate must be within the inclusive range [0-2000000].\n");
+         success = FALSE;
+     }
+     if (args->frequency <= 0) {
diff --git a/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r2.ebuild b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r2.ebuild
new file mode 100644
index 000000000000..83613fae77ac
--- /dev/null
+++ b/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/recordmydesktop/recordmydesktop-0.3.8.1-r2.ebuild,v 1.1 2010/03/25 12:29:41 scarabeus Exp $
+
+EAPI=2
+
+DESCRIPTION="A desktop session recorder producing Ogg video/audio files"
+HOMEPAGE="http://recordmydesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/recordmydesktop/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa jack"
+
+RDEPEND="sys-libs/zlib
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXdamage
+	media-libs/libvorbis
+	media-libs/libogg
+	media-libs/libtheora[encode]
+	x11-libs/libICE
+	x11-libs/libSM
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+src_prepare() {
+	if has_version ">=x11-proto/xextproto-7.1.1"; then
+		sed -i \
+			-e 's:shmstr.h:shmproto.h:g' \
+			src/rmd_{getzpixmap.c,update_image.c} || die
+	fi
+
+	# fix weird Framerates with new libtheora
+	epatch "${FILESDIR}/${PV}-fix_new_theora.patch"
+}
+
+src_configure() {
+	econf \
+		--enable-dependency-tracking \
+		$(use_enable !alsa oss) \
+		$(use_enable jack)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README || die
+}