Fix building with FFmpeg >= 0.6 wrt #324357 by Diego E. Pettenò.

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

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index 9e3fd00d1578ab381cfdacbad86bb28951f32885..43764e4e1ec56a1e7e06412ef7721fa856ad03db 100644 (file)
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.26 2010/05/01 00:58:17 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.27 2010/06/21 13:12:39 ssuominen Exp $
+
+  21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> gnash-0.8.7.ebuild:
+  Fix building with FFmpeg >= 0.6 wrt #324357 by Diego E. Pettenò.
 
   01 May 2010; Maciej Mrozowski <reavertm@gentoo.org> gnash-0.8.5.ebuild,
   gnash-0.8.6.ebuild, gnash-0.8.7.ebuild:

diff --git a/www-plugins/gnash/Manifest b/www-plugins/gnash/Manifest
index de8f15a19d9160d046636bc9662f97945591d660..7ed1f3eee4ca642c78a6d134cab2c911cef200d6 100644 (file)
--- a/www-plugins/gnash/Manifest
+++ b/www-plugins/gnash/Manifest
@@ -14,6 +14,6 @@ DIST gnash-0.8.6.tar.bz2 3571055 RMD160 987342b6cc46e94d5684d917bebbe6f6da6033bf
 DIST gnash-0.8.7.tar.bz2 3617298 RMD160 809e5dcf6f11567f7463d1e772053aa54f7170ed SHA1 bba6245ce251730fd58a59b37609ca4b8898ae01 SHA256 73b8a7c788511e453add26fd68cebd5818b39f9da21cc7c78e9cef8bc837e896
 EBUILD gnash-0.8.5.ebuild 6820 RMD160 2855295a73bfe2c067be9fe848d62babb53e70bd SHA1 8b121486471012c2ad87f239a595b6eb4bd34f1d SHA256 8724bc45eb19527ce8d1cf30d5a938ff732e1cea430a137c6ca6e5fe1b4393a1
 EBUILD gnash-0.8.6.ebuild 7707 RMD160 4dcfc972f1b33bd175b6a5f8992985f2fece3341 SHA1 2250706f45fdaa67314f87d85ba78cdfd8a48659 SHA256 780a3542eb3fdfafc1f97741c6ff6a6abc9ed89b81261306f57242ff633aca2b
-EBUILD gnash-0.8.7.ebuild 7960 RMD160 1e7a49449fbada32ccfe64c19bd9fca27a957e07 SHA1 cd73aefd025f3ee3be16b55c3409972fe12ce2e0 SHA256 5821c9936eeb5c5ec59faef67458b9c4af62c7d221560bbd4a619bfeb276a283
-MISC ChangeLog 17172 RMD160 797996227a2277f1c89cd6fd9cecbd530180fe55 SHA1 ef28e35abd2fa2735ce64d99ccb2f023505219d1 SHA256 eda64153433ccb31e2a0e8f28ac9106dc8aae7af5afaac1ed82cf97ba94fc5a4
+EBUILD gnash-0.8.7.ebuild 8022 RMD160 080629713def4a2142cfd1ba6b2d627c24e255d9 SHA1 dfad4e188c399324b76fcc34ddc57e258c8ede2d SHA256 7f2f39ab532dd90b91d0f2e60ae841d4a7ed1688d0658e5458c9e64beeb7bb45
+MISC ChangeLog 17316 RMD160 1a84c07a91c3dcdec554312c51d6becb9ab55b6a SHA1 ad2326d93fbac48578952f054e84d6c86fa307df SHA256 17b7484e330f9b2d70f03923f569309b17bac282a4fcb61f02264c95bba2786f
 MISC metadata.xml 629 RMD160 c09d2f9e4f61ffff0d0a86807f5ae79fc3986474 SHA1 3a7a29e2e3c9d91a0cd1fd61a35eb6e069f3a0e7 SHA256 145ff961a7e0d2e841559d29dd8ab3fc8e448acce4eacb4e8b960209d2a1f41f

diff --git a/www-plugins/gnash/gnash-0.8.7.ebuild b/www-plugins/gnash/gnash-0.8.7.ebuild
index 07d9776d9e6ddb045a4064f7f9c6263c1c56159a..a4868e5fc5c6a75551c9517bee4d5ff32fed9327 100644 (file)
--- a/www-plugins/gnash/gnash-0.8.7.ebuild
+++ b/www-plugins/gnash/gnash-0.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.7.ebuild,v 1.5 2010/05/01 00:58:17 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.7.ebuild,v 1.6 2010/06/21 13:12:39 ssuominen Exp $
 
 EAPI="2"
 CMAKE_REQUIRED="never"
@@ -8,7 +8,7 @@ KDE_REQUIRED="optional"
 KDE_MINIMAL="4.2"
 AT_M4DIR="cygnal"
 
-inherit autotools eutils kde4-base multilib nsplugins
+inherit autotools eutils kde4-base multilib nsplugins flag-o-matic
 
 DESCRIPTION="GNU Flash movie player that supports many SWF v7,8,9 features"
 HOMEPAGE="http://www.gnu.org/software/gnash/"
@@ -151,6 +151,8 @@ src_prepare() {
        eautoreconf
 }
 src_configure() {
+       append-flags -D__STDC_CONSTANT_MACROS #324357
+
        local myconf myext gui
 
        # Set nsplugin install directory.