From e97866adf216a1ee79386ca1290a62325579b225 Mon Sep 17 00:00:00 2001 From: reinoud Date: Tue, 28 Feb 2012 10:42:12 +0000 Subject: As per correspondence with Florian Kirsch, the author of OpenCSG, remove a piece of code that was obviously wrong to him. Fixes rendering problems. --- graphics/opencsg/Makefile | 6 +++--- graphics/opencsg/distinfo | 3 ++- graphics/opencsg/patches/patch-RenderTexture.cpp | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 graphics/opencsg/patches/patch-RenderTexture.cpp (limited to 'graphics') diff --git a/graphics/opencsg/Makefile b/graphics/opencsg/Makefile index b0f52e2310a..a08073003f2 100644 --- a/graphics/opencsg/Makefile +++ b/graphics/opencsg/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2012/02/26 20:41:04 reinoud Exp $ +# $NetBSD: Makefile,v 1.2 2012/02/28 10:42:12 reinoud Exp $ # PKGNAME= opencsg-1.3.2 DISTNAME= OpenCSG-1.3.2 +PKG_REVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.opencsg.org/ @@ -24,7 +25,6 @@ do-install: .include "../../mk/x11.buildlink3.mk" .include "../../graphics/glew/buildlink3.mk" -.include "../../graphics/glu/buildlink3.mk" -#.include "../../graphics/MesaLib/buildlink3.mk" +.include "../../graphics/glut/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/opencsg/distinfo b/graphics/opencsg/distinfo index c88fb10c882..58e84ae3380 100644 --- a/graphics/opencsg/distinfo +++ b/graphics/opencsg/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2012/02/26 20:41:04 reinoud Exp $ +$NetBSD: distinfo,v 1.2 2012/02/28 10:42:12 reinoud Exp $ SHA1 (OpenCSG-1.3.2.tar.gz) = e2b4abf169ae3e319eb5f6d9ae6136fa96710a05 RMD160 (OpenCSG-1.3.2.tar.gz) = 4480778c310a3d5f84933c1b35508dd94adf2332 Size (OpenCSG-1.3.2.tar.gz) = 744712 bytes SHA1 (patch-Makefile) = 13c3cc669156b04b5d09af9587f76d1055629518 +SHA1 (patch-RenderTexture.cpp) = 9d65c9928b4f42fde109b5497912e6654b188c69 diff --git a/graphics/opencsg/patches/patch-RenderTexture.cpp b/graphics/opencsg/patches/patch-RenderTexture.cpp new file mode 100644 index 00000000000..822e7d9453c --- /dev/null +++ b/graphics/opencsg/patches/patch-RenderTexture.cpp @@ -0,0 +1,18 @@ +$NetBSD: patch-RenderTexture.cpp,v 1.1 2012/02/28 10:42:13 reinoud Exp $ + +--- RenderTexture/RenderTexture.cpp.orig 2011-12-01 21:25:12.000000000 +0000 ++++ RenderTexture/RenderTexture.cpp +@@ -414,11 +414,13 @@ bool RenderTexture::Initialize(int width + GLXFBConfigSGIX *fbConfigs; + int nConfigs; + ++#if 0 + // [Andrew Wood] + //Add in pbufferAttribs. Needed to choose pixel format. (Especially for floating point) + _pixelFormatAttribs.insert(_pixelFormatAttribs.begin(), + _pbufferAttribs.begin(),_pbufferAttribs.end()); + // [/Andrew Wood] ++#endif + + fbConfigs = glXChooseFBConfigSGIX(_pDisplay, screen, + &_pixelFormatAttribs[0], &nConfigs); -- cgit v1.2.3