Fix CPPFLAGS and CXXFLAGS confusion in configure.ac.

Package-Manager: portage-2.2.0_alpha13/cvs/Linux x86_64

4 files changed, 35 insertions, 5 deletions

diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog
index 63692ff3bbef..39743ee8c69b 100644
--- a/media-video/ffmpegthumbnailer/ChangeLog
+++ b/media-video/ffmpegthumbnailer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpegthumbnailer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.110 2011/01/09 13:58:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.111 2011/01/09 14:05:49 ssuominen Exp $
+
+  09 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+  ffmpegthumbnailer-2.0.6.ebuild, +files/ffmpegthumbnailer-2.0.6-flags.patch:
+  Fix CPPFLAGS and CXXFLAGS confusion in configure.ac.
 
 *ffmpegthumbnailer-2.0.6 (09 Jan 2011)
 
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index 2155bbea2764..c16b24f31149 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1,4 +1,5 @@
 AUX ffmpegthumbnailer-2.0.6-asneeded.patch 763 RMD160 602d8a289b5da40e65d27f17fbe5781f5f601088 SHA1 e81d9f7b63b71c45a14f5b25c4397f4c37991ff1 SHA256 355341d389b90c31d0a80ba6ff92f6cbbcc3da397878f4b50b05500a8ac9a2e7
+AUX ffmpegthumbnailer-2.0.6-flags.patch 797 RMD160 58371ffbda3b458c202883e31b36697c826470a7 SHA1 4705bca7e0836782875117eff57883016ba09e0a SHA256 1f8bfe8a1cafdda386fbe2d19920874a001c64d58e5e1ca86aee7762755c4db4
 DIST ffmpegthumbnailer-2.0.2.tar.gz 339386 RMD160 077599abc5df30b04fe9978d57f31037b5cc389a SHA1 71024afb50e26217dc5de59a34f299551cb6816a SHA256 389bd60d0723df9e7d84219e21496500bd4fab320574d55462bb8e880c357780
 DIST ffmpegthumbnailer-2.0.4.tar.gz 343282 RMD160 a7a9af78f316d181a678ed85098c233aaa0808aa SHA1 ce1e55d9a207ec4eacc963e054ac5a08b9e051df SHA256 05871ee318c6a4afa1fc88503e51680390e4730c76ae0acf5b3791f3ea955d5e
 DIST ffmpegthumbnailer-2.0.5.tar.gz 344104 RMD160 abb1c8248632eebd80083a7743627c9ca56efde2 SHA1 5be44e2b58bd36e72a239675c3ad12d602cf6344 SHA256 b9e0268811ecef43618309784e826012dc04dcf8aa40d004b0811439751bd74a
@@ -6,6 +7,6 @@ DIST ffmpegthumbnailer-2.0.6.tar.gz 340052 RMD160 8c635c6d35b699ea9d2ef753fc70aa
 EBUILD ffmpegthumbnailer-2.0.2.ebuild 934 RMD160 f68cc925a2598503dad1ae7a30c2c639a1c73f54 SHA1 ac2faf0742dc252dee63c98307371bb1299d5353 SHA256 22d8d36dcb92c0b0c2c896ee96fc4ba0aaa667caa9ecbd3fa08460ba75eb1cc9
 EBUILD ffmpegthumbnailer-2.0.4.ebuild 1096 RMD160 fe4f267c018f40282733dd8c7dba17b1a8e6190c SHA1 694b754e1d67e0ea1e02043137270e9a3593b4cf SHA256 91057cbbfd5f8a09e204d3449dcf7020a5887473389ff0c5430063a4644f6612
 EBUILD ffmpegthumbnailer-2.0.5.ebuild 1095 RMD160 5e38744be6ea7ea136d61eaa7f1cbdf373d42a53 SHA1 35e8b70e23b2c15687c78abf669fab73f21119f9 SHA256 9ee4b5bc1c62ff802d838f63c431f63e3875b600a52c91b86e5b1e4d4b4a82b4
-EBUILD ffmpegthumbnailer-2.0.6.ebuild 1146 RMD160 1a1d306dbe6d33f2076fa470fe93d35d4e92870f SHA1 1f327a8e35ac635a290be6e9dc086713f2ba8755 SHA256 6529e9a39947eb9c1f6b2289c5ff15ac2244ad87c8370ba6b3c149311e1b0e6d
-MISC ChangeLog 15862 RMD160 b04b6a9d331aa66e86dc180c76281338210daa14 SHA1 071e85da107b604ea6470bad01360261473cf63f SHA256 7addee351729b320a4d881cbfc04a44989de5e6867a6d03f9b6a1ab47f1b0cbe
+EBUILD ffmpegthumbnailer-2.0.6.ebuild 1154 RMD160 3b301f84a4bbb85c10fafd39fdd7754b291377a1 SHA1 929b5062b772fb6d7d5357f1c3c35173dcf5728d SHA256 37fc6b7c1b9fe9fe3ae510069bd64aef209a1a86d1c20676969f40185dd676c0
+MISC ChangeLog 16050 RMD160 9bae18f5f974a8917bb1b15b6df3434e4c5f8254 SHA1 65f2409b9b03719cbba7784b7f302b1af555fcda SHA256 4353509046f02eb1912dc0f5af7d0f0273b37f85b7e1724718ddc0229e3774e7
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild
index 8d930269ef6b..641fae116a49 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild,v 1.1 2011/01/09 13:58:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.6.ebuild,v 1.2 2011/01/09 14:05:49 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -23,7 +23,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}-{asneeded,flags}.patch
 	eautoreconf
 }
 
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-flags.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-flags.patch
new file mode 100644
index 000000000000..2262faedfc73
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.6-flags.patch
@@ -0,0 +1,25 @@
+http://code.google.com/p/ffmpegthumbnailer/issues/detail?id=76
+
+--- configure.ac
++++ configure.ac
+@@ -104,9 +104,9 @@
+ fi
+ 
+ ########################################################################
+-# Compiler flags
++# Preprocessor flags
+ ########################################################################
+-CXXFLAGS=-D__STDC_CONSTANT_MACROS
++CPPFLAGS="$CPPFLAGS -D__STDC_CONSTANT_MACROS"
+ 
+ ########################################################################
+ # Check debug mode
+@@ -118,7 +118,7 @@
+ AM_CONDITIONAL(DEBUG, test "$enable_debug" = "yes")
+ if test "$DEBUG" = "yes"; then
+     AC_DEFINE(ENABLE_DEBUG, [], "Enable debug mode")
+-    CXXFLAGS+=" -g -O1 -Wall -Werror -Wfatal-errors"
++    CXXFLAGS="$CXXFLAGS -g -O1 -Wall -Werror -Wfatal-errors"
+ fi
+ 
+ AC_ARG_ENABLE(unittests,