From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 28 16:50:29 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A2FC16A4CE for ; Thu, 28 Oct 2004 16:50:29 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1485A43D54 for ; Thu, 28 Oct 2004 16:50:29 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i9SGoSMG083768 for ; Thu, 28 Oct 2004 16:50:28 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i9SGoSTC083767; Thu, 28 Oct 2004 16:50:28 GMT (envelope-from gnats) Resent-Date: Thu, 28 Oct 2004 16:50:28 GMT Resent-Message-Id: <200410281650.i9SGoSTC083767@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Igor Pokrovsky Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3EB6916A4E9 for ; Thu, 28 Oct 2004 16:41:46 +0000 (GMT) Received: from voodoo.oberon.net (voodoo.oberon.net [212.118.165.100]) by mx1.FreeBSD.org (Postfix) with ESMTP id C54A143D45 for ; Thu, 28 Oct 2004 16:41:45 +0000 (GMT) (envelope-from igor@doom.homeunix.org) Received: from dialup84126-209.ip.peterstar.net ([84.204.126.209] helo=doom.homeunix.org) by voodoo.oberon.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.43 (FreeBSD)) id 1CNDL2-0007KZ-P9 for FreeBSD-gnats-submit@freebsd.org; Thu, 28 Oct 2004 18:41:45 +0200 Received: from doom.homeunix.org (localhost [127.0.0.1]) by doom.homeunix.org (8.13.1/8.13.1) with ESMTP id i9SGeOr6000606 for ; Thu, 28 Oct 2004 20:40:30 +0400 (MSD) (envelope-from igor@doom.homeunix.org) Received: (from igor@localhost) by doom.homeunix.org (8.13.1/8.13.1/Submit) id i9RFK4v2056553; Wed, 27 Oct 2004 19:20:04 +0400 (MSD) (envelope-from igor) Message-Id: <200410271520.i9RFK4v2056553@doom.homeunix.org> Date: Wed, 27 Oct 2004 19:20:04 +0400 (MSD) From: Igor Pokrovsky To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/73248: Update port: graphics/pixie fix build X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Igor Pokrovsky List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Oct 2004 16:50:29 -0000 >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@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 - 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}|' \ ${PKGMESSAGE} && ${CAT} ${PKGMESSAGE}) -.include +.include 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;iRelease-Note: >Audit-Trail: >Unformatted: