From: Samuli Suominen <ssuominen@gentoo.org>
Date: Wed, 16 Jun 2010 13:17:37 +0000 (+0000)
Subject: Fix building with FFmpeg >= 0.6 wrt #324279 by Alexis Ballier.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b15da8a034190d0a570a775dc89a4549a288246f;p=gentoo.git

Fix building with FFmpeg >= 0.6 wrt #324279 by Alexis Ballier.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/media-sound/kradio/ChangeLog b/media-sound/kradio/ChangeLog
index f7bf22b19f14..fa42963e761c 100644
--- a/media-sound/kradio/ChangeLog
+++ b/media-sound/kradio/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/kradio
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/ChangeLog,v 1.22 2009/06/02 10:43:55 scarabeus Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/ChangeLog,v 1.23 2010/06/16 13:17:37 ssuominen Exp $
+
+  16 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> kradio-4.0.0.ebuild:
+  Fix building with FFmpeg >= 0.6 wrt #324279 by Alexis Ballier.
 
 *kradio-4.0.0 (02 Jun 2009)
 
diff --git a/media-sound/kradio/Manifest b/media-sound/kradio/Manifest
index 93df6fef56e0..d49124c1e68b 100644
--- a/media-sound/kradio/Manifest
+++ b/media-sound/kradio/Manifest
@@ -1,4 +1,4 @@
 DIST kradio4-4.0.0.tar.gz 1789151 RMD160 cc5dfec9acd82b9c477793fa27ca3ce2626700d3 SHA1 1a085044d9ee51baaafbf4fd4b5ac492fec8e546 SHA256 658d8f102ac9db8900d5aa14d934f15424891837b1f7fb6356e0c68b51ae06ed
-EBUILD kradio-4.0.0.ebuild 1148 RMD160 b49da0519c51734c969f700d12aceaed184615f0 SHA1 cd072985eff1487b42c5a88eee06147cc3a3c899 SHA256 062a35b2361abce759689111e966299a82d8209f60bd7fc49a959d6776baa563
-MISC ChangeLog 3902 RMD160 78ae3d416e943a5c482dafd5fd961f15d253eb00 SHA1 7763e3c48ddbb1e2c17a3cbac5af4968684d9054 SHA256 be9f3a4989a7d608cd256df7ccacc4aba626f889a23037670b4287b475029403
+EBUILD kradio-4.0.0.ebuild 1206 RMD160 64425f87b4cd0781d93e4dd7c9884ddd52a63655 SHA1 9232bf3a08c9c2cacc1dba4da1624414e8abc3c6 SHA256 52d128d8d9109ea71ae86743d157f363a1e4dde1b25350185c653b0ed02ffae4
+MISC ChangeLog 4043 RMD160 f45434e8d93fcb31a74e11673c5e6f4fa39e7ffe SHA1 d48e54cbe0adbd5482fa6bb2bf3171868ebd17d2 SHA256 9421c112687d5125eac4c44b3dc2f92dd2b5599ff31f7b3e7d8bc66a4ce9b7e6
 MISC metadata.xml 220 RMD160 a7adf69690c8573ceceff9b8efa22e074c1c2499 SHA1 41f9fb9f2920aa457ff68d560d1a1a3d90a09915 SHA256 b3e0af69cc34497798ede4df65665f7e1ef13913da5ade30ed744343152648da
diff --git a/media-sound/kradio/kradio-4.0.0.ebuild b/media-sound/kradio/kradio-4.0.0.ebuild
index 6efba4233cb8..0450b1b5a21e 100644
--- a/media-sound/kradio/kradio-4.0.0.ebuild
+++ b/media-sound/kradio/kradio-4.0.0.ebuild
@@ -1,13 +1,13 @@
-# 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/media-sound/kradio/kradio-4.0.0.ebuild,v 1.1 2009/06/02 10:43:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-4.0.0.ebuild,v 1.2 2010/06/16 13:17:37 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
 
 KDE_LINGUAS="cs de es pl pt ru uk"
-inherit kde4-base
+inherit flag-o-matic kde4-base
 
-MY_P="${PN}4-${PV/_/-}"
+MY_P=${PN}4-${PV/_/-}
 
 DESCRIPTION="kradio is a radio tuner application for KDE"
 HOMEPAGE="http://kradio.sourceforge.net/"
@@ -34,15 +34,19 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_configure() {
-	local mycmakeargs="$(cmake-utils_use_with alsa ALSA)
+	append-cppflags -D__STDC_CONSTANT_MACROS #324279
+
+	mycmakeargs=(
+		$(cmake-utils_use_with alsa ALSA)
 		$(cmake-utils_use_with mp3 LAME)
 		$(cmake-utils_use_with vorbis OGG_VORBIS)
 		$(cmake-utils_use_with lirc LIRC)
 		$(cmake-utils_use_with ffmpeg FFMPEG)
-		$(cmake-utils_use_with v4l2 V4L2)"
+		$(cmake-utils_use_with v4l2 V4L2)
+		)
 
 	kde4-base_src_configure
 }