Fix for ffmpeg, bug #132532

Package-Manager: portage-2.1_rc3-r4

5 files changed, 54 insertions, 7 deletions

diff --git a/games-misc/jugglemaster/ChangeLog b/games-misc/jugglemaster/ChangeLog
index f07a84108fd7..7b2ebb6c5b72 100644
--- a/games-misc/jugglemaster/ChangeLog
+++ b/games-misc/jugglemaster/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-misc/jugglemaster
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/jugglemaster/ChangeLog,v 1.5 2005/08/24 04:45:48 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/jugglemaster/ChangeLog,v 1.6 2006/06/03 10:30:06 tupone Exp $
+
+  03 Jun 2006; <Tupone@gentoo.org> +files/jugglemaster-0.4-ffmpeg.patch,
+  jugglemaster-0.4.ebuild:
+  Fix emerge with new ffmpeg, bug #132532
 
   24 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org>
   -jugglemaster-0.3.ebuild, jugglemaster-0.4.ebuild:
diff --git a/games-misc/jugglemaster/Manifest b/games-misc/jugglemaster/Manifest
index 4253f04b03a5..720f543af98d 100644
--- a/games-misc/jugglemaster/Manifest
+++ b/games-misc/jugglemaster/Manifest
@@ -1,4 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX jugglemaster-0.4-ffmpeg.patch 329 RMD160 4fa74314d419605057836855e155dc0d639a9571 SHA1 f7b921161168a76a80837ef01ef2cc342f87efb3 SHA256 907f9ed1de7ac419d5a05bf73d6961204ce77150caf5a5dbfb981ffbe4b6c75e
+MD5 5889ad9fd88a3df50e99db7fdb618b23 files/jugglemaster-0.4-ffmpeg.patch 329
+RMD160 4fa74314d419605057836855e155dc0d639a9571 files/jugglemaster-0.4-ffmpeg.patch 329
+SHA256 907f9ed1de7ac419d5a05bf73d6961204ce77150caf5a5dbfb981ffbe4b6c75e files/jugglemaster-0.4-ffmpeg.patch 329
+DIST jugglemaster-0.4.tar.bz2 134034 RMD160 c3e27e4285256fbe8934d86c81490ac246a33775 SHA1 25ff829f3c077333c5977598521233b37517ab6f SHA256 6af92b537bff4ba2dbdd1d26891ec7826c39760fc45a1247952d53b26a56d239
+EBUILD jugglemaster-0.4.ebuild 979 RMD160 c9282314e2416241876a1e9498674b51bc3164c8 SHA1 d8a05c5ed3badaf3e4e6a0ec50ed356b49d52f51 SHA256 99b25ad83350f888af984c2b07b39439256fcb2cd03e2812f820984e18eb2e4c
+MD5 132e289c1b802146014ba72fa8be7393 jugglemaster-0.4.ebuild 979
+RMD160 c9282314e2416241876a1e9498674b51bc3164c8 jugglemaster-0.4.ebuild 979
+SHA256 99b25ad83350f888af984c2b07b39439256fcb2cd03e2812f820984e18eb2e4c jugglemaster-0.4.ebuild 979
+MISC ChangeLog 842 RMD160 73dfcd0d3eeb394c72939276ba1c14a307f65e1b SHA1 0a0c530b07aca45fcf1d070a8fd03c92d82a89fc SHA256 d8debf9950b54582318d636f568ace43be202b1c29658bda114a80aaeea1e136
+MD5 b99c4581e6bc4f387f60b6f4d50609da ChangeLog 842
+RMD160 73dfcd0d3eeb394c72939276ba1c14a307f65e1b ChangeLog 842
+SHA256 d8debf9950b54582318d636f568ace43be202b1c29658bda114a80aaeea1e136 ChangeLog 842
+MISC metadata.xml 621 RMD160 a7352205b97da04ee51a8073d73006cce6518476 SHA1 e90f0219f1c9a807e7c9fd5e0445e58be6b4a45e SHA256 8c0578a5d8a87ca4e37d01b2bc559fdf6c13c811f5ed3fd9b726c6d9fd5419cc
 MD5 ae0ac63a9e262c96f2bfd0aee170fc40 metadata.xml 621
-MD5 c937a2ecde1989916d7accf13cccb8cd ChangeLog 702
-MD5 71774d7e13067666c9c2d3b73779aef9 jugglemaster-0.4.ebuild 927
-MD5 497dd9c489522b5368fb24c6bea83b4e files/digest-jugglemaster-0.4 69
+RMD160 a7352205b97da04ee51a8073d73006cce6518476 metadata.xml 621
+SHA256 8c0578a5d8a87ca4e37d01b2bc559fdf6c13c811f5ed3fd9b726c6d9fd5419cc metadata.xml 621
+MD5 d47fd1c2a6e911d1c2b01f6dc55246cd files/digest-jugglemaster-0.4 253
+RMD160 b2e76bf66235604e3a945905b0685c845054421d files/digest-jugglemaster-0.4 253
+SHA256 16106f56bd3a1b863e6f60758ce086fef356bcc55a80c9eaac86de39502e5f03 files/digest-jugglemaster-0.4 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEgWS42CTtIKiFlQIRAp4fAJ0Yr0I8Wi9LfeoPAefOQfZNPExCCgCgg0yV
+Os2JcJdJDZR3kJxl5i6oCGw=
+=jasu
+-----END PGP SIGNATURE-----
diff --git a/games-misc/jugglemaster/files/digest-jugglemaster-0.4 b/games-misc/jugglemaster/files/digest-jugglemaster-0.4
index a3b4a1505521..92d6eb64b3c9 100644
--- a/games-misc/jugglemaster/files/digest-jugglemaster-0.4
+++ b/games-misc/jugglemaster/files/digest-jugglemaster-0.4
@@ -1 +1,3 @@
 MD5 7fa64a548c495c4f0f345de479963a11 jugglemaster-0.4.tar.bz2 134034
+RMD160 c3e27e4285256fbe8934d86c81490ac246a33775 jugglemaster-0.4.tar.bz2 134034
+SHA256 6af92b537bff4ba2dbdd1d26891ec7826c39760fc45a1247952d53b26a56d239 jugglemaster-0.4.tar.bz2 134034
diff --git a/games-misc/jugglemaster/files/jugglemaster-0.4-ffmpeg.patch b/games-misc/jugglemaster/files/jugglemaster-0.4-ffmpeg.patch
new file mode 100644
index 000000000000..b7c8b68436a1
--- /dev/null
+++ b/games-misc/jugglemaster/files/jugglemaster-0.4-ffmpeg.patch
@@ -0,0 +1,13 @@
+--- src/jmdlx/print.cpp
++++ src/jmdlx/print.cpp
+@@ -559,8 +559,8 @@
+ 	c->width = jmlib->getImageWidth();
+ 	c->height = jmlib->getImageHeight();
+ 	/* c->frame_rate = 70/delay->GetValue(); */
+-	c->frame_rate = 25;
+-	c->frame_rate_base= 1;
++	c->time_base.den = 25;
++	c->time_base.num = 1;
+ 	c->gop_size = 30;
+ 	c->max_b_frames=1;
+ 
diff --git a/games-misc/jugglemaster/jugglemaster-0.4.ebuild b/games-misc/jugglemaster/jugglemaster-0.4.ebuild
index 0b3b428a38e1..ad86d0a1d3e5 100644
--- a/games-misc/jugglemaster/jugglemaster-0.4.ebuild
+++ b/games-misc/jugglemaster/jugglemaster-0.4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/jugglemaster/jugglemaster-0.4.ebuild,v 1.2 2005/08/24 04:45:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/jugglemaster/jugglemaster-0.4.ebuild,v 1.3 2006/06/03 10:30:06 tupone Exp $
 
+inherit eutils
 DESCRIPTION="A siteswap animator"
 HOMEPAGE="http://icculus.org/jugglemaster/"
 SRC_URI="http://icculus.org/${PN}/download/${P}.tar.bz2"
@@ -17,6 +18,7 @@ DEPEND="x11-libs/wxGTK
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}/${P}"-ffmpeg.patch
 	if use ffmpeg ; then
 		sed -i \
 			-e "s/libavcodec/ffmpeg/" \