summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Boeck <hanno@gentoo.org>2008-06-21 13:20:47 +0000
committerHanno Boeck <hanno@gentoo.org>2008-06-21 13:20:47 +0000
commitec70de2744d6b6c688adea59a9e0ef68d113aba4 (patch)
tree0fa1b896f9c603c60112355e4c1543c186f0aaba /games-arcade/stepmania
parentStable on ppc wrt bug 227603 (diff)
downloadhistorical-ec70de2744d6b6c688adea59a9e0ef68d113aba4.tar.gz
historical-ec70de2744d6b6c688adea59a9e0ef68d113aba4.tar.bz2
historical-ec70de2744d6b6c688adea59a9e0ef68d113aba4.zip
stepmania fix for new ffmpeg
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.4 i686
Diffstat (limited to 'games-arcade/stepmania')
-rw-r--r--games-arcade/stepmania/ChangeLog6
-rw-r--r--games-arcade/stepmania/Manifest15
-rw-r--r--games-arcade/stepmania/files/stepmania-3.9-newffmpeg.diff19
-rw-r--r--games-arcade/stepmania/stepmania-3.9.ebuild4
4 files changed, 40 insertions, 4 deletions
diff --git a/games-arcade/stepmania/ChangeLog b/games-arcade/stepmania/ChangeLog
index 05fc19a8b3fd..7643b239d064 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.21 2008/04/14 19:57:15 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.22 2008/06/21 13:20:46 hanno Exp $
+
+ 21 Jun 2008; Hanno Boeck <hanno@gentoo.org>
+ +files/stepmania-3.9-newffmpeg.diff, stepmania-3.9.ebuild:
+ Fix paths for latest ffmpeg.
14 Apr 2008; Samuli Suominen <drac@gentoo.org> stepmania-3.9.ebuild:
Bumping patch level to 3 for bug 216128, GCC 4.3 compability patch by
diff --git a/games-arcade/stepmania/Manifest b/games-arcade/stepmania/Manifest
index 1b72e2ab0b5c..abb7a620e5f7 100644
--- a/games-arcade/stepmania/Manifest
+++ b/games-arcade/stepmania/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX stepmania-3.9-gentoo.patch 941 RMD160 d352bf2106973e9a993293d3f1d6f14f7f125a60 SHA1 f8e9d59e85024b4847afe6b6bf164c83475e990a SHA256 eb82b01bcb17d0f09024deb1624e63682a27f49086e43c42b45f85821ba03b2d
+AUX stepmania-3.9-newffmpeg.diff 527 RMD160 b78e8cd88ad14605afb4bf7c1876b02fe8b4df3f SHA1 5b715fffdc52ca39e4e4a25d2ed65b4994a6ba31 SHA256 b2f735b1532b782f2aac9d99e793ab7e86856c6cf18ae9d6f9b21729f6a05ab8
DIST StepMania-3.9-linux.tar.gz 10174400 RMD160 426b11d652669be85753161f2cd03f2fe81df860 SHA1 100b1a2771fec1d208798ef03ba164259a589bf2 SHA256 ccb6e549e8d026e79de7d6bbfadc7f1ac7f7c05242a90edf56cf652f5ddeaae0
DIST StepMania-3.9-src.tar.gz 3090223 RMD160 e7451192fe67f53a7a93baf99bf9a20bc3d1f7cf SHA1 b2d2c3a50c23506844ba7e22289e59d270bb8b2e SHA256 31082d388fa64b9764aee4d7628f377bc0fe47b8f157b8bcc66d9e3678479c85
DIST stepmania-patches-3.tar.bz2 10043 RMD160 6d120931f7482fbe2908eb4d3f34a8b3e4a99b5d SHA1 26b835c0316b07a42d92ede3ecd51485a477d845 SHA256 e5f988b7e404846612f5bb327d0c3bbf2552de0ef20fde9943510b00fc54502c
-EBUILD stepmania-3.9.ebuild 2260 RMD160 d89559ee080f2cb9a120339a8c0d3f2c7615db70 SHA1 11ab6b269d3b6d6403be150eea64bf98ae5a9554 SHA256 fde9c08a7774b550dc13366d018e0299567e9bfc3e57e44c344112a93fc67a7a
-MISC ChangeLog 4423 RMD160 c18ca15f165a8d37f76f3f2acb805a406d49cc36 SHA1 e96548cb636306148b1d54a3c10cfe5df4535d92 SHA256 0d878cb1dc29b544716f0738d71b802026005a83bd5bafcc58f2f42ecb2c5b35
+EBUILD stepmania-3.9.ebuild 2304 RMD160 610fb0938363f372365b9e5eb3434294d1869254 SHA1 c3f0804e485316945a68b7b308af2371c8d8c3e9 SHA256 f2ff6301a2b00bcfb83af2bd25c9834937e2bcdd2dafe6287e593e4362a845e4
+MISC ChangeLog 4563 RMD160 8048b17b3da8937a084238ebb326261d41cf1622 SHA1 b4909b0087f9ed855edab3a885ecaadb8ba9cde1 SHA256 427196c18b8329752e3044c91fc1a0f8e245e0fc5abaf6f5766411d253952595
MISC metadata.xml 252 RMD160 e411517dfb6780a014783443250bcc27b2f2ab55 SHA1 2b0c462d2a8f8ef492eec0126df154578d704c2d SHA256 9d0e4b5866a81feafc2114ba80b39a45e341eb905734f978cbabc588bcabcd85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhdADsACgkQr2QksT29OyDXbgCfYzkV7qG0ShOsTW+xu689+1PI
+4M8AoJ8UewSsk7OYjOkbREEJo6Ycskqm
+=eLR7
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/stepmania/files/stepmania-3.9-newffmpeg.diff b/games-arcade/stepmania/files/stepmania-3.9-newffmpeg.diff
new file mode 100644
index 000000000000..dd6f9a408bfd
--- /dev/null
+++ b/games-arcade/stepmania/files/stepmania-3.9-newffmpeg.diff
@@ -0,0 +1,19 @@
+--- 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.ebuild
index d665dbf4ebbb..3658b367ec9f 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.13 2008/04/14 19:57:15 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9.ebuild,v 1.14 2008/06/21 13:20:46 hanno Exp $
inherit autotools eutils games
@@ -50,6 +50,8 @@ src_unpack() {
EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches
epatch "${T}"/gentoo.patch
+ epatch "${FILESDIR}/${P}-newffmpeg.diff"
+
AT_M4DIR="autoconf/m4"
eautoreconf
}