From bde0d5bf13c4b400c6b2e11467c2af458a6c64b8 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Fri, 16 Mar 2012 09:30:46 +0000 Subject: Add patch for gcc-4.6. Fixes bug#363167. (Portage version: 2.2.0_alpha90/cvs/Linux x86_64) --- media-plugins/libvisual-projectm/ChangeLog | 8 ++++++-- media-plugins/libvisual-projectm/files/2.0.1-gcc4.6.patch | 15 +++++++++++++++ .../libvisual-projectm/libvisual-projectm-2.0.1.ebuild | 10 ++++++++-- 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 media-plugins/libvisual-projectm/files/2.0.1-gcc4.6.patch (limited to 'media-plugins') diff --git a/media-plugins/libvisual-projectm/ChangeLog b/media-plugins/libvisual-projectm/ChangeLog index b0b6158ae244..045bb3752b29 100644 --- a/media-plugins/libvisual-projectm/ChangeLog +++ b/media-plugins/libvisual-projectm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/libvisual-projectm -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-projectm/ChangeLog,v 1.9 2009/12/10 20:00:12 ssuominen Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-projectm/ChangeLog,v 1.10 2012/03/16 09:30:46 scarabeus Exp $ + + 16 Mar 2012; Tomáš Chvátal +files/2.0.1-gcc4.6.patch, + libvisual-projectm-2.0.1.ebuild: + Add patch for gcc-4.6. Fixes bug#363167. *libvisual-projectm-2.0.1 (10 Dec 2009) diff --git a/media-plugins/libvisual-projectm/files/2.0.1-gcc4.6.patch b/media-plugins/libvisual-projectm/files/2.0.1-gcc4.6.patch new file mode 100644 index 000000000000..9ae5f609815e --- /dev/null +++ b/media-plugins/libvisual-projectm/files/2.0.1-gcc4.6.patch @@ -0,0 +1,15 @@ +Fix build failure with GCC4.6 + +http://projectm.svn.sourceforge.net/viewvc/projectm?view=revision&revision=1355 + +--- trunk/src/projectM-libvisual/actor_projectM.cpp 2009/02/20 19:07:44 1210 ++++ trunk/src/projectM-libvisual/actor_projectM.cpp 2011/05/06 12:04:58 1355 +@@ -209,7 +209,7 @@ + * we aren't with projectm, so just ignore :) */ + extern "C" VisPalette *lv_projectm_palette (VisPluginData *plugin) + { +- return NULL; ++ return (VisPalette *) NULL; + } + + /* This is where the real rendering happens! This function is what we call, many times diff --git a/media-plugins/libvisual-projectm/libvisual-projectm-2.0.1.ebuild b/media-plugins/libvisual-projectm/libvisual-projectm-2.0.1.ebuild index e2576cb423f1..c296aee17e3f 100644 --- a/media-plugins/libvisual-projectm/libvisual-projectm-2.0.1.ebuild +++ b/media-plugins/libvisual-projectm/libvisual-projectm-2.0.1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-projectm/libvisual-projectm-2.0.1.ebuild,v 1.1 2009/12/10 20:00:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-projectm/libvisual-projectm-2.0.1.ebuild,v 1.2 2012/03/16 09:30:46 scarabeus Exp $ + +EAPI=4 inherit cmake-utils @@ -24,3 +26,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} DOCS="AUTHORS ChangeLog" + +PATCHES=( + "${FILESDIR}/${PV}-gcc4.6.patch" +) -- cgit v1.2.3-65-gdbad