Bump patchset to fix FFmpeg >= 0.5 compability wrt #269080, thanks to Wai Ling.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 27 insertions, 62 deletions

diff --git a/games-arcade/stepmania/ChangeLog b/games-arcade/stepmania/ChangeLog
index abbec7021bf7..766914728ce1 100644
--- a/games-arcade/stepmania/ChangeLog
+++ b/games-arcade/stepmania/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-arcade/stepmania
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.28 2009/03/24 21:21:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.29 2009/06/20 23:05:23 ssuominen Exp $
+
+*stepmania-3.9-r1 (20 Jun 2009)
+
+  20 Jun 2009; Samuli Suominen <ssuominen@gentoo.org> -stepmania-3.9.ebuild,
+  +stepmania-3.9-r1.ebuild, -files/stepmania-3.9-newerffmpeg.diff,
+  -files/stepmania-3.9-newffmpeg.diff:
+  Bump patchset to fix FFmpeg >= 0.5 compability wrt #269080, thanks to Wai Ling.
 
   24 Mar 2009; Michael Sterrett <mr_bones_@gentoo.org> stepmania-3.9.ebuild:
   add joystick use dep for bug #263553
@@ -8,12 +15,6 @@
   19 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> stepmania-3.9.ebuild:
   EAPI=2; add use-based dep
 
-  24 Nov 2008; <ssuominen@gentoo.org> stepmania-3.9.ebuild:
-  Move patchset tarball out of my old dev space to gentoo mirrors.
-
-  24 Nov 2008; <ssuominen@gentoo.org> metadata.xml:
-  Remove my old e-mail from metadata.xml. I don't play this.
-
   15 Oct 2008; Peter Alfredsen <loki_val@gentoo.org>
   +files/stepmania-3.9-newerffmpeg.diff, stepmania-3.9.ebuild:
   Fix for ffmpeg 20081014. Bug 242054.
diff --git a/games-arcade/stepmania/files/stepmania-3.9-newerffmpeg.diff b/games-arcade/stepmania/files/stepmania-3.9-newerffmpeg.diff
deleted file mode 100644
index d8a659da4308..000000000000
--- a/games-arcade/stepmania/files/stepmania-3.9-newerffmpeg.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-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/files/stepmania-3.9-newffmpeg.diff b/games-arcade/stepmania/files/stepmania-3.9-newffmpeg.diff
deleted file mode 100644
index dd6f9a408bfd..000000000000
--- a/games-arcade/stepmania/files/stepmania-3.9-newffmpeg.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- StepMania-3.9-src/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp.1	2008-06-21 14:48:57.000000000 +0200
-+++ StepMania-3.9-src/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp	2008-06-21 14:49:16.000000000 +0200
-@@ -25,14 +25,14 @@
- #else
- extern "C"
- {
--#include <ffmpeg/avformat.h>
-+#include <libavformat/avformat.h>
- }
- #endif
- 
- #if !defined(HAVE_IMG_CONVERT)
- extern "C"
- {
--#include <ffmpeg/swscale.h>
-+#include <libswscale/swscale.h>
- }
- #endif // HAVE_IMG_CONVERT
-     void img_convert__(AVPicture *dst, int dst_pix_fmt,
diff --git a/games-arcade/stepmania/stepmania-3.9.ebuild b/games-arcade/stepmania/stepmania-3.9-r1.ebuild
index 4a279025a2d0..948362891db8 100644
--- a/games-arcade/stepmania/stepmania-3.9.ebuild
+++ b/games-arcade/stepmania/stepmania-3.9-r1.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2009 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.19 2009/03/24 21:21:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9-r1.ebuild,v 1.1 2009/06/20 23:05:23 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils games
 
-MY_PV=${PV/_/-}
-
+MY_P=StepMania-${PV}
 DESCRIPTION="An advanced DDR simulator"
 HOMEPAGE="http://www.stepmania.com/stepmania/"
-SRC_URI="mirror://sourceforge/stepmania/StepMania-${MY_PV}-src.tar.gz
-	mirror://sourceforge/stepmania/StepMania-${MY_PV}-linux.tar.gz
-	mirror://gentoo/${PN}-patches-3.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz
+	mirror://sourceforge/${PN}/${MY_P}-linux.tar.gz
+	http://dev.gentoo.org/~ssuominen/distfiles/${P}-patches-4.tar.gz
+	mirror://gentoo/${P}-patches-4.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug gtk jpeg mad ffmpeg vorbis force-oss"
+IUSE="debug ffmpeg force-oss gtk jpeg mad vorbis"
 
 RESTRICT="test"
 
@@ -26,31 +26,26 @@ RDEPEND="gtk? ( x11-libs/gtk+:2 )
 	media-libs/libsdl[joystick,opengl]
 	jpeg? ( media-libs/jpeg )
 	media-libs/libpng
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
+	ffmpeg? ( >=media-video/ffmpeg-0.5 )
 	vorbis? ( media-libs/libvorbis )
 	virtual/opengl
 	virtual/glu"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-S=${WORKDIR}/StepMania-${MY_PV}-src
+S=${WORKDIR}/${MY_P}-src
 
 src_prepare() {
 	sed "s:/usr/share/games/${PN}:${GAMES_DATADIR}/${PN}:" \
-		"${FILESDIR}"/${P}-gentoo.patch > "${T}"/gentoo.patch
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches
-	epatch \
-		"${T}"/gentoo.patch \
-		"${FILESDIR}/${P}-newffmpeg.diff" \
-		"${FILESDIR}/${P}-newerffmpeg.diff" #Bug 242054
+		"${FILESDIR}"/${P}-gentoo.patch > "${T}"/${P}.patch
 
-	AT_M4DIR="autoconf/m4"
-	eautoreconf
+	EPATCH_SUFFIX=patch epatch "${T}"/${P}.patch "${WORKDIR}"/patches
+	AT_M4DIR=autoconf/m4 eautoreconf
 }
 
 src_configure() {
-	econf --disable-dependency-tracking \
+	econf \
+		--disable-dependency-tracking \
 		$(use_with debug) \
 		$(use_with jpeg) \
 		$(use_with vorbis) \
@@ -64,22 +59,23 @@ src_install() {
 
 	exeinto "${dir}"
 	doexe src/stepmania || die "doexe failed"
+
 	if use gtk; then
 		doexe src/GtkModule.so || die "doexe failed"
 	fi
 
-	cd "${WORKDIR}"/StepMania-${MY_PV}
+	cd "${WORKDIR}"/${MY_P}
 
 	insinto "${dir}"
 	doins -r Announcers BGAnimations CDTitles Characters Courses Data Docs \
 		NoteSkins RandomMovies Songs Themes Visualizations || die "doins failed"
 
-	dodoc Copying.txt NEWS README-FIRST.html
+	dodoc Copying.txt NEWS
+	dohtml README-FIRST.html
 
-	make_desktop_entry ${PN} Stepmania
 	newicon "Themes/default/Graphics/Common window icon.png" ${PN}.png
+	make_desktop_entry ${PN} StepMania
 
 	games_make_wrapper ${PN} "${dir}"/${PN} "${dir}"
-
 	prepgamesdirs
 }