Tue Feb 28 10:42:13 2012 UTC ()
As per correspondence with Florian Kirsch, the author of OpenCSG, remove a
piece of code that was obviously wrong to him. Fixes rendering problems.


(reinoud)
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/opencsg/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/graphics/opencsg/distinfo
diff -r0 -r1.1 pkgsrc/graphics/opencsg/patches/patch-RenderTexture.cpp
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/opencsg/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/opencsg/Makefile 2012/02/26 20:41:04 1.1.1.1
+++ pkgsrc/graphics/opencsg/Makefile 2012/02/28 10:42:12 1.2
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.1.1.1 2012/02/26 20:41:04 reinoud Exp $ 1# $NetBSD: Makefile,v 1.2 2012/02/28 10:42:12 reinoud Exp $
2# 2#
3 3
4PKGNAME= opencsg-1.3.2 4PKGNAME= opencsg-1.3.2
5DISTNAME= OpenCSG-1.3.2 5DISTNAME= OpenCSG-1.3.2
 6PKG_REVISION= 1
6CATEGORIES= graphics 7CATEGORIES= graphics
7MASTER_SITES= http://www.opencsg.org/ 8MASTER_SITES= http://www.opencsg.org/
8 9
9MAINTAINER= reinoud@tomaatnet.nl 10MAINTAINER= reinoud@tomaatnet.nl
10HOMEPAGE= http://www.opencsg.org/ 11HOMEPAGE= http://www.opencsg.org/
11COMMENT= Image based CSG rendering library using OpenGL 12COMMENT= Image based CSG rendering library using OpenGL
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
16USE_TOOLS+= pkg-config gmake 17USE_TOOLS+= pkg-config gmake
17USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
18 19
19do-install: 20do-install:
20 ${INSTALL_LIB} -d ${DESTDIR}${PREFIX}/lib 21 ${INSTALL_LIB} -d ${DESTDIR}${PREFIX}/lib
21 ${INSTALL_LIB} -d ${DESTDIR}${PREFIX}/include 22 ${INSTALL_LIB} -d ${DESTDIR}${PREFIX}/include
22 ${INSTALL_LIB} ${WRKSRC}/lib/* ${DESTDIR}${PREFIX}/lib/ 23 ${INSTALL_LIB} ${WRKSRC}/lib/* ${DESTDIR}${PREFIX}/lib/
23 ${INSTALL_DATA} ${WRKSRC}/include/* ${DESTDIR}${PREFIX}/include/ 24 ${INSTALL_DATA} ${WRKSRC}/include/* ${DESTDIR}${PREFIX}/include/
24 25
25.include "../../mk/x11.buildlink3.mk" 26.include "../../mk/x11.buildlink3.mk"
26.include "../../graphics/glew/buildlink3.mk" 27.include "../../graphics/glew/buildlink3.mk"
27.include "../../graphics/glu/buildlink3.mk" 28.include "../../graphics/glut/buildlink3.mk"
28#.include "../../graphics/MesaLib/buildlink3.mk" 
29.include "../../x11/libXmu/buildlink3.mk" 29.include "../../x11/libXmu/buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/graphics/opencsg/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/opencsg/distinfo 2012/02/26 20:41:04 1.1.1.1
+++ pkgsrc/graphics/opencsg/distinfo 2012/02/28 10:42:12 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.1.1.1 2012/02/26 20:41:04 reinoud Exp $ 1$NetBSD: distinfo,v 1.2 2012/02/28 10:42:12 reinoud Exp $
2 2
3SHA1 (OpenCSG-1.3.2.tar.gz) = e2b4abf169ae3e319eb5f6d9ae6136fa96710a05 3SHA1 (OpenCSG-1.3.2.tar.gz) = e2b4abf169ae3e319eb5f6d9ae6136fa96710a05
4RMD160 (OpenCSG-1.3.2.tar.gz) = 4480778c310a3d5f84933c1b35508dd94adf2332 4RMD160 (OpenCSG-1.3.2.tar.gz) = 4480778c310a3d5f84933c1b35508dd94adf2332
5Size (OpenCSG-1.3.2.tar.gz) = 744712 bytes 5Size (OpenCSG-1.3.2.tar.gz) = 744712 bytes
6SHA1 (patch-Makefile) = 13c3cc669156b04b5d09af9587f76d1055629518 6SHA1 (patch-Makefile) = 13c3cc669156b04b5d09af9587f76d1055629518
 7SHA1 (patch-RenderTexture.cpp) = 9d65c9928b4f42fde109b5497912e6654b188c69
File Added: pkgsrc/graphics/opencsg/patches/patch-RenderTexture.cpp
$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);