Fix white window problem with libvisual-projectm and amarok wrt #211263, thanks to Torsten Grote. Fix also building with GCC 4.3.

Package-Manager: portage-2.1.5_rc3

5 files changed, 51 insertions, 9 deletions

diff --git a/media-libs/libprojectm/ChangeLog b/media-libs/libprojectm/ChangeLog
index ae6779a6a0d6..fa951e23ccc1 100644
--- a/media-libs/libprojectm/ChangeLog
+++ b/media-libs/libprojectm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libprojectm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.20 2008/02/15 16:10:32 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.21 2008/04/16 18:00:57 drac Exp $
+
+  16 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/libprojectm-1.01-gcc43.patch,
+  +files/libprojectm-1.01-white_window.patch, libprojectm-1.01-r1.ebuild:
+  Fix white window problem with libvisual-projectm and amarok wrt #211263,
+  thanks to Torsten Grote. Fix also building with GCC 4.3.
 
   15 Feb 2008; Samuli Suominen <drac@gentoo.org> -libprojectm-0.99.ebuild,
   -libprojectm-1.01.ebuild:
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 530ef41f2f2b..7c9306b49039 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1,10 +1,12 @@
 AUX libprojectm-1.01-cmake_soname.patch 602 RMD160 b9b2ce285b48720244f18fa26b10ebb1be901c73 SHA1 7db17842af43727fee45d8a1e15dcde4b6421074 SHA256 219f55f831816f03e02c9bd5f58186a2b482355ef8359417108a1ffe5de61461
+AUX libprojectm-1.01-gcc43.patch 354 RMD160 c2f6c64c67f0f6410417a5463f28ebda34a79a74 SHA1 64a0ea9f9750067161a754f6d3f58d80ce0dc67e SHA256 b4d0e0e638c2132bfe2312415d0e8c36b513964e6d07789df586d004e667fd77
 AUX libprojectm-1.01-malloc.patch 260 RMD160 07538e9d9ffa853f7632ff8c08e21288d77229c1 SHA1 f0bdad329e79314393412c50ae4994cb79a14810 SHA256 bf5c494b440e0743ff4bb440c14c7c999228a1b3f26ecd05ac6bfd7846bb05fc
 AUX libprojectm-1.01-soil_64bit_fixes.patch 1776 RMD160 249bab285412586c993119c25b056ba305e2b471 SHA1 068fc0b958c0e51cbb6663bc17fb883f94b54571 SHA256 41a5bac4124a49d31c54f3c874bfc53ef94cdad9f680633fc54a818536dc671d
+AUX libprojectm-1.01-white_window.patch 966 RMD160 81c9de4cce04b406f7c069578ca301eb20000c48 SHA1 3a0636cbc4c9ba217772731ccffd02f09a2f5320 SHA256 3cdb4677f2f1364abf07672cd73c07b1b34212414296f677e872df1875f2ce94
 AUX libprojectm-fbsd.patch 3693 RMD160 13ea332af3d210dc58d816e17fde51063cab70f5 SHA1 2b51513be1e0926d614f9ab4a72aac75ce9b5109 SHA256 861d40f21295a9de8431fcb09bb2fa9aa4b3f928f4fd4ae2a98263978b6b6577
 DIST libprojectM-0.99.tar.bz2 593967 RMD160 1eae8abdcba3b26e733e73202d49fd0646bc96fa SHA1 6a4fda8828aa2a5cdeb34674ba62a240823fdc48 SHA256 cd359df2bb89e89a9c4cc4a1f5bf44ac3ec4776fb9834a5aa2e3ca297a7dcc06
 DIST libprojectM-1.01.tar.bz2 536349 RMD160 d612868ca85a5d4ea5e6b520dab592f412426ee2 SHA1 9f3eec8df359da125a26809d3daf1feb320e0095 SHA256 2b321dacba21593b2886c9f61c186620dacb0d8fe48488a5793ddf022008de59
 EBUILD libprojectm-0.99-r1.ebuild 925 RMD160 7ffd90dc0038bb425b18dfed4acc6ee6a72eb92a SHA1 d5a7e44571438006db7e925b333aef67d70b3bf1 SHA256 e1adefa6755143ce1ccc4abed6edde05061b9da5104c84e1b41832c719fccdbe
-EBUILD libprojectm-1.01-r1.ebuild 1485 RMD160 9b8e352b352362ef7a94f5d2aaf7de426bc53c0f SHA1 d3196c6c7dd51654fc25693255839bfddc66120d SHA256 003b524982923d914f0e697f0267bb12592678042060e2d9dfe51910a5299df9
-MISC ChangeLog 2954 RMD160 3ea10e77bf698d3837960e0bd4a494c192373b8b SHA1 8970f421e03be6202eec92c17df824d7314594dc SHA256 267601f266bc90b5d8b249d3981eeb678a1636fec389f6cbf5e527ef1acdcca7
+EBUILD libprojectm-1.01-r1.ebuild 1552 RMD160 2406aa7d8cc88d229cd7ccb08f6e78d27e100959 SHA1 d2bae44a38c20d9bad7811e667a250b14d006a1d SHA256 2316d87120b04867cf449f70314a0622c176bf295f1dfd6473af2314677720b2
+MISC ChangeLog 3251 RMD160 d14744d0fb9e98d5e6077a857b45c72effb39fb7 SHA1 a8eec38746b0fa8d998e84218f8285a4c7384e63 SHA256 ad0017626a87f6a87402ac372ce2474a6e510c84da919a72d36a7108354df1cc
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-libs/libprojectm/files/libprojectm-1.01-gcc43.patch b/media-libs/libprojectm/files/libprojectm-1.01-gcc43.patch
new file mode 100644
index 000000000000..e97d7124ce1b
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-1.01-gcc43.patch
@@ -0,0 +1,12 @@
+diff -ur libprojectM-1.01.orig/Param.hpp libprojectM-1.01/Param.hpp
+--- libprojectM-1.01.orig/Param.hpp	2007-10-10 17:47:14.000000000 +0300
++++ libprojectM-1.01/Param.hpp	2008-04-16 20:55:38.000000000 +0300
+@@ -54,6 +54,8 @@
+ #include "Common.hpp"
+ #include <cmath>
+ #include <string>
++#include <stdlib.h>
++
+ class InitCond;
+ class Param;
+ class Preset;
diff --git a/media-libs/libprojectm/files/libprojectm-1.01-white_window.patch b/media-libs/libprojectm/files/libprojectm-1.01-white_window.patch
new file mode 100644
index 000000000000..3336aa0bdc8c
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-1.01-white_window.patch
@@ -0,0 +1,20 @@
+--- FBO.cpp	2007-10-10 16:47:14.000000000 +0200
++++ FBO.new	2008-02-24 06:08:16.000000000 +0100
+@@ -176,7 +176,7 @@
+         //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+         //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ 
+-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
++	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ 
+         glTexImage2D(GL_TEXTURE_2D,
+@@ -217,7 +217,7 @@
+         //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+         //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ 
+-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
++	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ 
+         glTexImage2D(GL_TEXTURE_2D,
diff --git a/media-libs/libprojectm/libprojectm-1.01-r1.ebuild b/media-libs/libprojectm/libprojectm-1.01-r1.ebuild
index c5925087d729..d0993e10b8d2 100644
--- a/media-libs/libprojectm/libprojectm-1.01-r1.ebuild
+++ b/media-libs/libprojectm/libprojectm-1.01-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-1.01-r1.ebuild,v 1.2 2007/11/12 04:31:43 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-1.01-r1.ebuild,v 1.3 2008/04/16 18:00:57 drac Exp $
 
 inherit eutils toolchain-funcs
 
@@ -25,14 +25,16 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/cmake"
 
-S="${WORKDIR}"/${MY_P}
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-malloc.patch
-	epatch "${FILESDIR}"/${P}-soil_64bit_fixes.patch
-	epatch "${FILESDIR}"/${P}-cmake_soname.patch
+	epatch "${FILESDIR}"/${P}-malloc.patch \
+		"${FILESDIR}"/${P}-soil_64bit_fixes.patch \
+		"${FILESDIR}"/${P}-cmake_soname.patch \
+		"${FILESDIR}"/${P}-white_window.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 
 	sed -e "s#/lib/pkgconfig#/$(get_libdir)/pkgconfig#" \
 		-e "s#DESTINATION lib#DESTINATION $(get_libdir)#" \