From 2d3106e0e6ab4c50dd70fc3869dd546cbcd1f531 Mon Sep 17 00:00:00 2001 From: Peter Alfredsen Date: Wed, 15 Oct 2008 15:58:10 +0000 Subject: Fix for ffmpeg 20081014. Bug 242054. (Portage version: 2.2_rc12/cvs/Linux 2.6.27-rc8 x86_64) --- games-arcade/stepmania/ChangeLog | 6 +++++- games-arcade/stepmania/files/stepmania-3.9-newerffmpeg.diff | 13 +++++++++++++ games-arcade/stepmania/stepmania-3.9.ebuild | 3 ++- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 games-arcade/stepmania/files/stepmania-3.9-newerffmpeg.diff (limited to 'games-arcade/stepmania') diff --git a/games-arcade/stepmania/ChangeLog b/games-arcade/stepmania/ChangeLog index 9c33ec7b12ad..3f4b1d4b60ed 100644 --- a/games-arcade/stepmania/ChangeLog +++ b/games-arcade/stepmania/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/stepmania # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.23 2008/07/29 19:01:53 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.24 2008/10/15 15:58:09 loki_val Exp $ + + 15 Oct 2008; Peter Alfredsen + +files/stepmania-3.9-newerffmpeg.diff, stepmania-3.9.ebuild: + Fix for ffmpeg 20081014. Bug 242054. 29 Jul 2008; Samuli Suominen stepmania-3.9.ebuild: Bump ffmpeg dep. for last change to 0.4.9_p20080326 wrt #232364. diff --git a/games-arcade/stepmania/files/stepmania-3.9-newerffmpeg.diff b/games-arcade/stepmania/files/stepmania-3.9-newerffmpeg.diff new file mode 100644 index 000000000000..d8a659da4308 --- /dev/null +++ b/games-arcade/stepmania/files/stepmania-3.9-newerffmpeg.diff @@ -0,0 +1,13 @@ +Index: StepMania-3.9-src/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp +=================================================================== +--- StepMania-3.9-src.orig/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp ++++ StepMania-3.9-src/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp +@@ -574,7 +574,7 @@ int URLRageFile_read( avcodec::URLContex + return f->Read( buf, size ); + } + +-avcodec::offset_t URLRageFile_seek( avcodec::URLContext *h, avcodec::offset_t pos, int whence ) ++int64_t URLRageFile_seek( avcodec::URLContext *h, int64_t pos, int whence ) + { + RageFile *f = (RageFile *) h->priv_data; + return f->Seek( (int) pos, whence ); diff --git a/games-arcade/stepmania/stepmania-3.9.ebuild b/games-arcade/stepmania/stepmania-3.9.ebuild index 08962425eafc..cc435455595f 100644 --- a/games-arcade/stepmania/stepmania-3.9.ebuild +++ b/games-arcade/stepmania/stepmania-3.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9.ebuild,v 1.15 2008/07/29 19:01:53 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9.ebuild,v 1.16 2008/10/15 15:58:09 loki_val Exp $ inherit autotools eutils games @@ -51,6 +51,7 @@ src_unpack() { epatch "${T}"/gentoo.patch epatch "${FILESDIR}/${P}-newffmpeg.diff" + epatch "${FILESDIR}/${P}-newerffmpeg.diff" #Bug 242054 AT_M4DIR="autoconf/m4" eautoreconf -- cgit v1.2.3-65-gdbad