Fix build with ffmpeg-0.6, bug #324251

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/games-misc/jugglemaster/ChangeLog b/games-misc/jugglemaster/ChangeLog
index d8ed9fee789209a50be5466e4e6d6c33d15d65f9..36d2620ed22fd49c519830f2c8b092b26062a040 100644 (file)
--- a/games-misc/jugglemaster/ChangeLog
+++ b/games-misc/jugglemaster/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-misc/jugglemaster
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/jugglemaster/ChangeLog,v 1.12 2009/08/17 21:34:03 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/jugglemaster/ChangeLog,v 1.13 2010/06/16 15:38:17 aballier Exp $
+
+  16 Jun 2010; Alexis Ballier <aballier@gentoo.org> jugglemaster-0.4.ebuild:
+  Fix build with ffmpeg-0.6, bug #324251
 
   17 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org>
   jugglemaster-0.4.ebuild:

diff --git a/games-misc/jugglemaster/Manifest b/games-misc/jugglemaster/Manifest
index 07fa7834d312c01178e59a36d090319b9f765eea..a52d360a6ab58c99e412a1b5f226d77b9639591f 100644 (file)
--- a/games-misc/jugglemaster/Manifest
+++ b/games-misc/jugglemaster/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX jugglemaster-0.4-ffmpeg.patch 594 RMD160 57d6de5c81bf92bcb22d88b74c8dbc13a60b9a99 SHA1 8402d74a120bd12cb7a8bd04d0ad03abaf26f7f2 SHA256 527edcf8387e4835a5e6484f57de56af7112ecbf3eca141139a30d1bd6866a34
 DIST jugglemaster-0.4.tar.bz2 134034 RMD160 c3e27e4285256fbe8934d86c81490ac246a33775 SHA1 25ff829f3c077333c5977598521233b37517ab6f SHA256 6af92b537bff4ba2dbdd1d26891ec7826c39760fc45a1247952d53b26a56d239
-EBUILD jugglemaster-0.4.ebuild 1265 RMD160 55fade936caa096cb233ad04758e6f0d7488613f SHA1 504c254e355b236ff16ed15059ba3ce754fdaf91 SHA256 24ea2fe2721369227f43d5cc25f2e3dd939310f1dd57ba40edff4dc12302ad02
-MISC ChangeLog 1474 RMD160 6d2ba2d9806598fbe32784f14cd87949303dfcc4 SHA1 4573120b0132d34930f8f0cdec8cbdfe4ddfd03f SHA256 4f1a088340c877cda14a10971a4b76b238120d86a19a0c8f36cece4135b952b2
+EBUILD jugglemaster-0.4.ebuild 1359 RMD160 51c3dfd276db77348a04d7a46a6d348d5ba120b1 SHA1 a3cfc11af37afb3dd3b3092166c583b4750f4190 SHA256 31b7a95052f6e879f03089c375ede43759cac3f42a935ae939c17cf4f87cb16d
+MISC ChangeLog 1592 RMD160 1f00ae80421a6900ec86d3416fe4c1ef58f20111 SHA1 90569a3eb1c04015b372e4ef2bbf28a600c30ad8 SHA256 da169d94a71ac74c0ccf3b9f8f541e14ffbed1a218fe6e2697a1958d2e1858b8
 MISC metadata.xml 621 RMD160 a7352205b97da04ee51a8073d73006cce6518476 SHA1 e90f0219f1c9a807e7c9fd5e0445e58be6b4a45e SHA256 8c0578a5d8a87ca4e37d01b2bc559fdf6c13c811f5ed3fd9b726c6d9fd5419cc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwY7+4ACgkQvFcC4BYPU0pxOwCfQuWrT//XTnFykCk1cdsWANym
+o/4AoJH2ttryhkN+63OR962Nt0QgzUVZ
+=I79t
+-----END PGP SIGNATURE-----

diff --git a/games-misc/jugglemaster/jugglemaster-0.4.ebuild b/games-misc/jugglemaster/jugglemaster-0.4.ebuild
index fb7aa1aa225bd8d29b54ec0f1a1eca4dccb08e20..81bd7ba7681858a13a993b66de362970e1b104ad 100644 (file)
--- a/games-misc/jugglemaster/jugglemaster-0.4.ebuild
+++ b/games-misc/jugglemaster/jugglemaster-0.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.8 2009/08/17 21:34:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/jugglemaster/jugglemaster-0.4.ebuild,v 1.9 2010/06/16 15:38:17 aballier Exp $
 
 EAPI=2
 WX_GTK_VER="2.6"
-inherit eutils wxwidgets games
+inherit eutils wxwidgets games flag-o-matic
 
 DESCRIPTION="A siteswap animator"
 HOMEPAGE="http://icculus.org/jugglemaster/"
@@ -37,6 +37,8 @@ src_prepare() {
                -e "s:wx-config:${WX_CONFIG}:" \
                src/jmdlx/Makefile \
                || die "sed Makefile (wx) failed"
+       #bug #324251 (UINT64_C vs ffmpeg headers)
+       append-flags -D__STDC_CONSTANT_MACROS
 }
 
 src_compile() {