upgrade to 0.9.1

This commit is contained in:
Ying-Chieh Liao 2004-04-12 09:44:31 +00:00
parent aef9236c70
commit c99b6e3b0d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=106799
11 changed files with 57 additions and 181 deletions

View file

@ -7,8 +7,8 @@
#
PORTNAME= aqsis
PORTVERSION= 0.8.0
PORTREVISION= 2
PORTVERSION= 0.9.1
PORTREVISION= 0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -16,16 +16,16 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A photorealistic rendering system
LIB_DEPENDS= log4cpp.4:${PORTSDIR}/devel/log4cpp \
tiff.4:${PORTSDIR}/graphics/tiff
BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
USE_MESA= yes
USE_GL= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-static --datadir="${DATADIR}"
CONFIGURE_ARGS= --enable-static --enable-Mesa=no
INSTALLS_SHLIB= yes
CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC
@ -38,11 +38,16 @@ CFLAGS+= -O0
.endif
post-patch:
@${REINPLACE_CMD} -e 's|PLUGIN_FLAGS=|#PLUGIN_FLAGS=|g ; \
s|^CPPFLAGS="-D|CPPFLAGS="\$$CPPFLAGS -D|g ; \
s|^CFLAGS=|#CFLAGS=|g ; \
s|^CXXFLAGS=|#CXXFLAGS=|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|PLUGIN_FLAGS=|#PLUGIN_FLAGS=|g' ${WRKSRC}/configure
@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
's|malloc\.h|stdlib.h|g'
post-install:
.for dir in ${PREFIX}/include/aqsis ${PREFIX}/lib/aqsis ${PREFIX}/share/aqsis
@${FIND} ${dir} ! -type d | \
${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
@${FIND} ${dir} -type d | ${SORT} -r | \
${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
.endfor
.include <bsd.port.post.mk>

View file

@ -1,2 +1,2 @@
MD5 (aqsis-0.8.0.tar.gz) = 2dbee9888aea39400a99afb37a287242
SIZE (aqsis-0.8.0.tar.gz) = 1201232
MD5 (aqsis-0.9.1.tar.gz) = 25ff47648aee39d0be4294628d143a7e
SIZE (aqsis-0.9.1.tar.gz) = 2574709

View file

@ -1,13 +1,13 @@
--- aqsis/aqsis.cpp.orig Sun Feb 16 23:36:02 2003
+++ aqsis/aqsis.cpp Sat Apr 19 22:56:01 2003
@@ -82,8 +82,8 @@
return ;
}
--- aqsis/aqsis.cpp.orig Mon Apr 12 13:45:33 2004
+++ aqsis/aqsis.cpp Mon Apr 12 13:46:02 2004
@@ -113,8 +113,8 @@
return ;
}
- static long tick = 0;
- long now;
+ static time_t tick = 0;
+ time_t now;
- static long tick = 0;
- long now;
+ static time_t tick = 0;
+ time_t now;
if ( tick == 0 )
time( &tick );
if ( tick == 0 )
time( &tick );

View file

@ -1,11 +0,0 @@
--- aqsltell/Makefile.in.orig Sun Sep 21 05:17:44 2003
+++ aqsltell/Makefile.in Sun Sep 28 23:19:14 2003
@@ -103,7 +103,7 @@
bin_PROGRAMS = aqsltell
aqsltell_SOURCES = aqsltell.cpp
-aqsltell_LDADD = $(top_builddir)/libslxargs/libslxargs.la $(top_builddir)/libshadervm/libshadervm.la $(top_builddir)/libshaderexecenv/libshaderexecenv.la $(top_builddir)/libaqsistypes/libaqsistypes.la $(top_builddir)/libargparse/libargparse.la
+aqsltell_LDADD = $(top_builddir)/render/libaqsis.la $(top_builddir)/libslxargs/libslxargs.la $(top_builddir)/libshadervm/libshadervm.la $(top_builddir)/libshaderexecenv/libshaderexecenv.la $(top_builddir)/libaqsistypes/libaqsistypes.la $(top_builddir)/libargparse/libargparse.la
INCLUDES = -I$(top_srcdir)/libaqsistypes -I$(top_srcdir)/libaqsistypes/posix -I$(top_srcdir)/libshadervm -I$(top_srcdir)/libshaderexecenv -I$(top_srcdir)/libslxargs -I$(top_srcdir)/libargparse

View file

@ -0,0 +1,11 @@
--- libdd/dd.cpp.orig Mon Apr 12 16:13:20 2004
+++ libdd/dd.cpp Mon Apr 12 16:02:24 2004
@@ -26,6 +26,8 @@
#include <iostream>
#include <memory>
+#include <string>
+#include <errno.h>
#include "aqsis.h"
#include <logging.h>

View file

@ -1,10 +0,0 @@
--- libddmsock/ddmsock.cpp.orig Sat Sep 6 03:37:58 2003
+++ libddmsock/ddmsock.cpp Sun Sep 28 22:22:06 2003
@@ -40,6 +40,7 @@
#include <unistd.h>
#include <netinet/in.h>
#include <sys/types.h>
+#include <sys/signal.h>
#include <sys/socket.h>
#include <sys/wait.h>
#include <errno.h>

View file

@ -1,11 +0,0 @@
--- libslparse/parsenode.cpp.orig Tue May 14 12:53:14 2002
+++ libslparse/parsenode.cpp Sat Oct 12 14:11:49 2002
@@ -118,7 +118,7 @@
for ( i = 0; i < Type_Last; i++ )
{
if ( gVariableTypeIdentifiers[ i ][ 0 ] == Id ||
-#if defined(AQSIS_SYSTEM_MACOSX) || defined (AQSIS_SYSTEM_BEOS)
+#if defined(AQSIS_SYSTEM_MACOSX) || defined (AQSIS_SYSTEM_BEOS) || defined(__FreeBSD__)
gVariableTypeIdentifiers[ i ][ 0 ] == tolower( Id ) )
#else
gVariableTypeIdentifiers[ i ][ 0 ] == _tolower( Id ) )

View file

@ -1,36 +1,10 @@
--- ltmain.sh.orig Sun Sep 21 05:17:09 2003
+++ ltmain.sh Sun Sep 28 23:27:28 2003
@@ -1056,14 +1056,14 @@
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
- *-*-openbsd*)
+ *-*-openbsd* | *-*-freebsd*)
# Do not include libc due to us having libc/libc_r.
test "X$arg" = "X-lc" && continue
;;
esac
elif test "X$arg" = "X-lc_r"; then
case $host in
- *-*-openbsd*)
+ *-*-openbsd* | *-*-freebsd*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -2499,7 +2499,7 @@
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
- *-*-openbsd*)
+ *-*-openbsd* | *-*-freebsd*)
# Do not include libc due to us having libc/libc_r.
;;
*)
@@ -4286,10 +4286,12 @@
--- ltmain.sh.orig Mon Apr 12 13:48:59 2004
+++ ltmain.sh Mon Apr 12 13:49:22 2004
@@ -4394,10 +4394,12 @@
fi
# Install the pseudo-library for information purposes.
+ if /usr/bin/false; then
+ if /usr/bin/false ; then
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name"

View file

@ -1,11 +1,11 @@
--- render/ri.cpp.orig Fri Sep 19 17:03:14 2003
+++ render/ri.cpp Mon Sep 29 11:33:21 2003
@@ -3271,7 +3271,7 @@
TqInt iElem;
for( iElem = 0; iElem < fvcount; iElem++ )
{
- const unsigned char* pval = static_cast<const unsigned char*>( values[ iUserParam ] ) + ( aFVList[ iElem ] * elem_size );
+ unsigned char* pval = static_cast<unsigned char*>( values[ iUserParam ] ) + ( aFVList[ iElem ] * elem_size );
memcpy( pNew, pval, elem_size );
pNew += elem_size;
}
--- render/ri.cpp.orig Mon Apr 12 13:49:57 2004
+++ render/ri.cpp Mon Apr 12 13:51:26 2004
@@ -3608,7 +3608,7 @@
TqInt iElem;
for( iElem = 0; iElem < fvcount; ++iElem )
{
- const unsigned char* pval = static_cast<const unsigned char*>( values[ iUserParam ] ) + ( aFVList[ iElem ] * elem_size );
+ unsigned char* pval = static_cast<unsigned char*>( values[ iUserParam ] ) + ( aFVList[ iElem ] * elem_size );
memcpy( pNew, pval, elem_size );
pNew += elem_size;
}

View file

@ -1,11 +0,0 @@
--- shaders/Makefile.in.orig Sun Sep 21 05:18:05 2003
+++ shaders/Makefile.in Mon Sep 29 00:21:58 2003
@@ -237,7 +237,7 @@
$(mkinstalldirs) $(shaderdir)
$(INSTALL_DATA) $(srcdir)/*.h $(shaderdir)
$(INSTALL_DATA) $(srcdir)/*.sl $(shaderdir)
- PATH=$$PATH:$(bindir); cd $(shaderdir); for file in $$(find . -name "*.sl"); do $(bindir)/aqsl $$file; done
+# PATH=$$PATH:$(bindir); cd $(shaderdir); for file in $$(find . -name "*.sl"); do $(bindir)/aqsl $$file; done
uninstall-local:
rm -f $(shaderdir)/*.h

View file

@ -4,34 +4,9 @@ bin/aqsis_framebuffer_glut_z
bin/aqsl
bin/aqsltell
bin/filebuffer
bin/ri2ribtest
bin/shadowmap
bin/teqser
etc/ddmsock.ini
include/aqsis.h
include/aqsis_types.h
include/argparse.h
include/bitvector.h
include/color.h
include/exception.h
include/file.h
include/librib.h
include/librib2ri.h
include/librib2stream.h
include/list.h
include/matrix.h
include/memorypool.h
include/parserstate.h
include/random.h
include/refcount.h
include/ri.h
include/shadeop.h
include/share.h
include/slx.h
include/sstring.h
include/vector2d.h
include/vector3d.h
include/vector4d.h
lib/libaqsis.a
lib/libaqsis.so
lib/libaqsis.so.0
@ -41,9 +16,6 @@ lib/libaqsistypes.so.0
lib/libargparse.a
lib/libargparse.so
lib/libargparse.so.0
lib/libbake2tif.a
lib/libbake2tif.so
lib/libbake2tif.so.0
lib/libcodegenvm.a
lib/libcodegenvm.so
lib/libcodegenvm.so.0
@ -56,18 +28,9 @@ lib/libddmsimple.so.0
lib/libddmsock.a
lib/libddmsock.so
lib/libddmsock.so.0
lib/libgif2tif.a
lib/libgif2tif.so
lib/libgif2tif.so.0
lib/libjpg2tif.a
lib/libjpg2tif.so
lib/libjpg2tif.so.0
lib/libpcx2tif.a
lib/libpcx2tif.so
lib/libpcx2tif.so.0
lib/libppm2tif.a
lib/libppm2tif.so
lib/libppm2tif.so.0
lib/libraytrace.a
lib/libraytrace.so
lib/libraytrace.so.0
lib/libri2rib.a
lib/libri2rib.so
lib/libri2rib.so.0
@ -95,37 +58,3 @@ lib/libslpp.so.0
lib/libslxargs.a
lib/libslxargs.so
lib/libslxargs.so.0
lib/libtga2tif.a
lib/libtga2tif.so
lib/libtga2tif.so.0
%%DATADIR%%/shaders/DPProctext.h
%%DATADIR%%/shaders/ambientlight.sl
%%DATADIR%%/shaders/borg_metal.sl
%%DATADIR%%/shaders/brickbump.sl
%%DATADIR%%/shaders/bumpy.sl
%%DATADIR%%/shaders/cellnoisetest.sl
%%DATADIR%%/shaders/constant.sl
%%DATADIR%%/shaders/curvetube.sl
%%DATADIR%%/shaders/debug.sl
%%DATADIR%%/shaders/dented.sl
%%DATADIR%%/shaders/depthcue.sl
%%DATADIR%%/shaders/distantlight.sl
%%DATADIR%%/shaders/dpbluemarble.sl
%%DATADIR%%/shaders/fog.sl
%%DATADIR%%/shaders/matte.sl
%%DATADIR%%/shaders/metal.sl
%%DATADIR%%/shaders/noises.h
%%DATADIR%%/shaders/paintedplastic.sl
%%DATADIR%%/shaders/patterns.h
%%DATADIR%%/shaders/plastic.sl
%%DATADIR%%/shaders/pointlight.sl
%%DATADIR%%/shaders/randgrid.sl
%%DATADIR%%/shaders/shadowspot.sl
%%DATADIR%%/shaders/shinymetal.sl
%%DATADIR%%/shaders/show_st.sl
%%DATADIR%%/shaders/spacetest.sl
%%DATADIR%%/shaders/spotlight.sl
%%DATADIR%%/shaders/uvtest.sl
%%DATADIR%%/shaders/wavy.sl
@dirrm %%DATADIR%%/shaders
@dirrm %%DATADIR%%