ports/73248: Update port: graphics/pixie fix build
Igor Pokrovsky
ip at doom.homeunix.org
Thu Oct 28 16:50:29 UTC 2004
>Number: 73248
>Category: ports
>Synopsis: Update port: graphics/pixie fix build
>Confidential: no
>Severity: critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 28 16:50:28 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Igor Pokrovsky
>Release: FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD doom.homeunix.org 4.10-STABLE FreeBSD 4.10-STABLE #0: Wed Oct 13 20:27:55 MSD 2004 root at doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL i386
>Description:
Fixed build (compilation problems).
Got rid of *.la
Bumped port revision.
>How-To-Repeat:
>Fix:
--- pixie.diff begins here ---
diff -ruN /usr/ports/graphics/pixie/Makefile pixie/Makefile
--- /usr/ports/graphics/pixie/Makefile Mon Aug 30 21:33:52 2004
+++ pixie/Makefile Wed Oct 27 19:14:42 2004
@@ -7,6 +7,7 @@
PORTNAME= pixie
PORTVERSION= 1.3.16
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -39,8 +40,6 @@
PKGMESSAGE= ${WRKDIR}/pkg-message
-.include <bsd.port.pre.mk>
-
post-patch:
@${REINPLACE_CMD} -i "" -e 's|malloc\.h|stdlib\.h|g' \
`${FIND} -E ${WRKSRC} -iregex '.*\.(cpp|h)'`
@@ -66,8 +65,6 @@
.for i in sdr ri
${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/lib${i}.a \
${PREFIX}/lib/${PORTNAME}
- ${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/lib${i}.la \
- ${PREFIX}/lib/${PORTNAME}
${INSTALL_PROGRAM} ${WRKSRC}/src/${i}/.libs/lib${i}.so.0 \
${PREFIX}/lib/${PORTNAME}
${LN} -sf ${PREFIX}/lib/${PORTNAME}/lib${i}.so.0 \
@@ -77,8 +74,6 @@
.for i in ${PIXIE_SHLIBS}
${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/${i}.a \
${PREFIX}/lib/${PORTNAME}
- ${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/${i}.la \
- ${PREFIX}/lib/${PORTNAME}
${INSTALL_PROGRAM} ${WRKSRC}/src/${i}/.libs/${i}.so.0 \
${PREFIX}/lib/${PORTNAME}
${LN} -sf ${PREFIX}/lib/${PORTNAME}/${i}.so.0 \
@@ -112,4 +107,4 @@
@(${SED} -e 's|%%PREFIX%%|${PREFIX}|; s|%%PORTNAME%%|${PORTNAME}|' \
<pkg-message >${PKGMESSAGE} && ${CAT} ${PKGMESSAGE})
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN /usr/ports/graphics/pixie/files/patch-src_common_containers.h pixie/files/patch-src_common_containers.h
--- /usr/ports/graphics/pixie/files/patch-src_common_containers.h Thu Jan 1 03:00:00 1970
+++ pixie/files/patch-src_common_containers.h Wed Oct 27 19:14:57 2004
@@ -0,0 +1,11 @@
+--- src/common/containers.h.orig
++++ src/common/containers.h
+@@ -589,7 +589,7 @@
+ memoryBase = new unsigned char[pageSize+16];
+ memory = memoryBase+16;
+ available = pageSize;
+- savedPages = NULL;
++ savedPages = (T32 *)NULL;
+ }
+
+ ~CMemStack() {
diff -ruN /usr/ports/graphics/pixie/files/patch-src_file_file.cpp pixie/files/patch-src_file_file.cpp
--- /usr/ports/graphics/pixie/files/patch-src_file_file.cpp Thu Jan 1 03:00:00 1970
+++ pixie/files/patch-src_file_file.cpp Wed Oct 27 19:15:01 2004
@@ -0,0 +1,36 @@
+--- src/file/file.cpp.orig
++++ src/file/file.cpp
+@@ -56,13 +56,13 @@
+ // Date last edited : 5/9/2002
+ CFramebuffer(const char *name,int width,int height,int numSamples,const char *samples,TDisplayParameterFunction findParameter) {
+ int i;
+- char *comment = NULL;
++ char *comment = (char*)NULL;
+ float *tmp;
+ float worldToNDC[16];
+ float worldToCamera[16];
+ char *software;
+ char desc[1024];
+- const char *compression = NULL;
++ const char *compression = (char*)NULL;
+
+ // Open the image file
+ image = TIFFOpen(name,"w");
+@@ -189,7 +189,7 @@
+ scanlineUsage = new int[height];
+
+ for (i=0;i<height;i++) {
+- scanlines[i] = NULL;
++ scanlines[i] = (unsigned char*)NULL;
+ scanlineUsage[i] = width;
+ }
+
+@@ -315,7 +315,7 @@
+ if (scanlines[lastSavedLine] != NULL) {
+ TIFFWriteScanline(image,scanlines[lastSavedLine],lastSavedLine,0);
+ delete [] scanlines[lastSavedLine];
+- scanlines[lastSavedLine] = NULL;
++ scanlines[lastSavedLine] = (unsigned char*)NULL;
+ }
+ } else {
+ break;
diff -ruN /usr/ports/graphics/pixie/files/patch-src_ri_renderer.h pixie/files/patch-src_ri_renderer.h
--- /usr/ports/graphics/pixie/files/patch-src_ri_renderer.h Thu Jan 1 03:00:00 1970
+++ pixie/files/patch-src_ri_renderer.h Wed Oct 27 19:15:04 2004
@@ -0,0 +1,35 @@
+--- src/ri/renderer.h.orig
++++ src/ri/renderer.h
+@@ -107,7 +107,7 @@
+ class CRendererContext : public CRiInterface {
+ public:
+
+- CRendererContext(char *ribName=NULL,char *netString=NULL);
++ CRendererContext(char *ribName=(char*)NULL,char *netString=(char*)NULL);
+ ~CRendererContext();
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -253,7 +253,7 @@
+ CEnvironment *environmentLoad(const char *,TSearchpath *,float *); // Load a new environment map
+
+ // Delayed object junk
+- void processDelayedObject(CDelayedObject *,void (*subdivisionFunction)(char *,float),char *,float,CRay *ray = NULL);
++ void processDelayedObject(CDelayedObject *,void (*subdivisionFunction)(char *,float),char *,float,CRay *ray = (CRay *)NULL);
+
+ void addObject(CObject *); // Add an object into the scene
+ void addInstance(void *); // Add an instance into the scene
+@@ -267,11 +267,11 @@
+ CVariable *retrieveVariable(const char *);
+
+ // Locate (download) a file
+- int locateFileEx(char *,const char *,const char *extension=NULL,TSearchpath *search=NULL);
+- int locateFile(char *,const char *,TSearchpath *search=NULL);
++ int locateFileEx(char *,const char *,const char *extension=(char*)NULL,TSearchpath *search=(TSearchpath *)NULL);
++ int locateFile(char *,const char *,TSearchpath *search=(TSearchpath *)NULL);
+
+ // Open (download) a file
+- FILE *openFile(const char *,const char *,const char *extension=NULL,TSearchpath *search=NULL);
++ FILE *openFile(const char *,const char *,const char *extension=(char*)NULL,TSearchpath *search=(TSearchpath *)NULL);
+
+ // The following functions are about texture management and are implemented in texture.cpp
+ void rendererThread(void *);
diff -ruN /usr/ports/graphics/pixie/files/patch-src_ri_texmake.cpp pixie/files/patch-src_ri_texmake.cpp
--- /usr/ports/graphics/pixie/files/patch-src_ri_texmake.cpp Thu Jan 1 03:00:00 1970
+++ pixie/files/patch-src_ri_texmake.cpp Wed Oct 27 19:15:10 2004
@@ -0,0 +1,47 @@
+--- src/ri/texmake.cpp.orig
++++ src/ri/texmake.cpp
+@@ -455,7 +455,7 @@
+ RtFilterFunc filter = filt;
+ float filterWidth = fwidth;
+ float filterHeight = fheight;
+- char *outPath = NULL;
++ char *outPath = (char*)NULL;
+ int pyramidSize;
+ char inputFileName[OS_MAX_PATH_LENGTH];
+ TIFF *outHandle;
+@@ -522,7 +522,7 @@
+ RtFilterFunc filter = filt;
+ float filterWidth = fwidth;
+ float filterHeight = fheight;
+- char *outPath = NULL;
++ char *outPath = (char*)NULL;
+ int pyramidSize;
+ char inputFileName[OS_MAX_PATH_LENGTH];
+ TIFF *outHandle;
+@@ -618,7 +618,7 @@
+ RtFilterFunc filter = filt;
+ float filterWidth = fwidth;
+ float filterHeight = fheight;
+- char *outPath = NULL;
++ char *outPath = (char*)NULL;
+ int pyramidSize;
+ char inputFileName[OS_MAX_PATH_LENGTH];
+ TIFF *outHandle;
+@@ -723,7 +723,7 @@
+ RtFilterFunc filter = filt;
+ float filterWidth = fwidth;
+ float filterHeight = fheight;
+- char *outPath = NULL;
++ char *outPath = (char*)NULL;
+ int pyramidSize;
+ char inputFileName[OS_MAX_PATH_LENGTH];
+ TIFF *outHandle;
+@@ -793,7 +793,7 @@
+ RtFilterFunc filter = filt;
+ float filterWidth = fwidth;
+ float filterHeight = fheight;
+- char *outPath = NULL;
++ char *outPath = (char*)NULL;
+ int pyramidSize;
+ char inputFileName[OS_MAX_PATH_LENGTH];
+ TIFF *outHandle;
diff -ruN /usr/ports/graphics/pixie/pkg-plist pixie/pkg-plist
--- /usr/ports/graphics/pixie/pkg-plist Mon Aug 30 21:33:52 2004
+++ pixie/pkg-plist Wed Oct 27 18:34:48 2004
@@ -11,23 +11,18 @@
include/pixie/sdr.h
include/pixie/shadeop.h
lib/pixie/file.a
-lib/pixie/file.la
lib/pixie/file.so
lib/pixie/file.so.0
lib/pixie/framebuffer.a
-lib/pixie/framebuffer.la
lib/pixie/framebuffer.so
lib/pixie/framebuffer.so.0
lib/pixie/libri.a
-lib/pixie/libri.la
lib/pixie/libri.so
lib/pixie/libri.so.0
lib/pixie/libsdr.a
-lib/pixie/libsdr.la
lib/pixie/libsdr.so
lib/pixie/libsdr.so.0
lib/pixie/rgbe.a
-lib/pixie/rgbe.la
lib/pixie/rgbe.so
lib/pixie/rgbe.so.0
%%PORTDOCS%%%%DOCSDIR%%/attributes.htm
--- pixie.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list