diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2006-06-03 10:30:06 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2006-06-03 10:30:06 +0000 |
| commit | e5416ec4ede2758a51d5a0ece7f585abfbb9b9cf (patch) | |
| tree | b449abb98a5d156b03e1d6b7bc932b245c563582 /games-misc | |
| parent | Version bump to 0.2.10. Resolves bug #135348. (diff) | |
| download | gentoo-2-e5416ec4ede2758a51d5a0ece7f585abfbb9b9cf.tar.gz gentoo-2-e5416ec4ede2758a51d5a0ece7f585abfbb9b9cf.tar.bz2 gentoo-2-e5416ec4ede2758a51d5a0ece7f585abfbb9b9cf.zip | |
Fix for ffmpeg, bug #132532
(Portage version: 2.1_rc3-r4)
Diffstat (limited to 'games-misc')
| -rw-r--r-- | games-misc/jugglemaster/ChangeLog | 8 | ||||
| -rw-r--r-- | games-misc/jugglemaster/files/digest-jugglemaster-0.4 | 2 | ||||
| -rw-r--r-- | games-misc/jugglemaster/files/jugglemaster-0.4-ffmpeg.patch | 13 | ||||
| -rw-r--r-- | games-misc/jugglemaster/jugglemaster-0.4.ebuild | 6 |
4 files changed, 25 insertions, 4 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/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/" \ |