- Update to 1.3.4

- Build show program (requires fltk)

PR:		ports/65104
Submitted by:	Igor Pokrovsky <tiamat@comset.net> (maintainer)
This commit is contained in:
Pav Lucistnik
2004-04-03 19:31:01 +00:00
parent c4c31e009a
commit c36db74dbc
5 changed files with 27 additions and 62 deletions

View File

@@ -6,8 +6,7 @@
#
PORTNAME= pixie
PORTVERSION= 1.3.1
PORTREVISION= 1
PORTVERSION= 1.3.4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,7 +16,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= tiamat@comset.net
COMMENT= A photorealistic renderer with Pixar's RenderMan-like interface
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
fltk_gl.1:${PORTSDIR}/x11-toolkits/fltk
USE_REINPLACE= yes
USE_GL= yes
@@ -31,20 +31,19 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS="${CFLAGS} -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
CXXFLAGS="${CXXFLAGS} -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
LIBS="${PTHREAD_LIBS}"
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
LIBS="${PTHREAD_LIBS} -lstdc++"
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/lib/${PORTNAME}
WRKSRC= ${WRKDIR}/Pixie
PIXIE_EXES= precomp rndr sdrc sdrinfo texmake
PIXIE_EXES= precomp rndr sdrc sdrinfo show texmake
PIXIE_SHLIBS= file framebuffer rgbe
PKGMESSAGE= ${WRKDIR}/pkg-message
post-patch:
@${WRKSRC}/makeunix
@${REINPLACE_CMD} -e 's|malloc\.h|stdlib\.h|g' \
@${REINPLACE_CMD} -i "" -e 's|malloc\.h|stdlib\.h|g' \
`${FIND} -E ${WRKSRC} -iregex '.*\.(cpp|h)'`
do-install:
@@ -81,7 +80,7 @@ do-install:
# includes
@${MKDIR} ${PREFIX}/include/${PORTNAME}
${INSTALL_DATA} ${WRKSRC}/src/sdr/sdr.h ${PREFIX}/include/${PORTNAME}
.for i in dsply implicit ri shadeop
.for i in dlo dsply implicit ri shadeop
${INSTALL_DATA} ${WRKSRC}/src/ri/${i}.h ${PREFIX}/include/${PORTNAME}
.endfor

View File

@@ -1,2 +1,2 @@
MD5 (Pixie-src-1.3.1.tgz) = 112b2684fb52b6511a65c78f78f7f019
SIZE (Pixie-src-1.3.1.tgz) = 4222641
MD5 (Pixie-src-1.3.4.tgz) = 84931bfea9d37dc4a4d002dc6f62202f
SIZE (Pixie-src-1.3.4.tgz) = 4272597

View File

@@ -1,33 +1,6 @@
--- configure.in.orig Sun Jan 25 04:16:25 2004
+++ configure.in Fri Jan 30 18:33:19 2004
@@ -22,8 +22,8 @@
dnl CPU - OS specific compiler flags
dnl
case $compiler in
- gcc)
- CFLAGS="-O3 -fstrict-aliasing -funroll-loops -ffast-math -fomit-frame-pointer -fno-rtti -fno-exceptions"
+ cc|gcc)
+ CFLAGS+="-O3 -fstrict-aliasing -funroll-loops -ffast-math -fomit-frame-pointer -fno-rtti -fno-exceptions"
dnl --------------------------------------
dnl Add the CPU dependent optimizations
@@ -48,20 +48,20 @@
;;
icc)
;;
- cc)
- CFLAGS="-O3 -apo -LNO -IPA"
- CXXFLAGS="$CFLAGS"
- LDFLAGS="${LDFLAGS} -s -IPA"
- ;;
+dnl cc)
+dnl CFLAGS="-O3 -apo -LNO -IPA"
+dnl CXXFLAGS="$CFLAGS"
+dnl LDFLAGS="${LDFLAGS} -s -IPA"
+dnl ;;
esac
--- configure.in.orig Sun Mar 21 09:55:41 2004
+++ configure.in Fri Apr 2 13:59:41 2004
@@ -21,9 +21,9 @@
dnl ---------------------------------------------------
dnl Check standard libraries
dnl
@@ -39,18 +12,22 @@
dnl ---------------------------------------------------
dnl Find X
@@ -90,8 +90,8 @@
@@ -52,9 +52,14 @@
FLTK_EXTRA=
-AC_CHECK_LIB(fltk,main,LIBFLTK="-lfltk")
-AC_CHECK_LIB(fltk_gl,main,[LIBFLTKGL="-lfltk_gl -lGL" FLTK_EXTRA=show])
+dnl AC_CHECK_LIB(fltk,main,LIBFLTK="-lfltk")
+dnl AC_CHECK_LIB(fltk_gl,main,[LIBFLTKGL="-lfltk_gl -lGL" FLTK_EXTRA=show])
+saved_LIBS="${LIBS}"
+
+LIBS="$LIBS -lGL"
+
AC_CHECK_LIB(fltk,main,LIBFLTK="-lfltk")
AC_CHECK_LIB(fltk_gl,main,[LIBFLTKGL="-lfltk_gl -lGL" FLTK_EXTRA=show])
FLTK_EXTRA=
+LIBS="${saved_LIBS}"
@@ -101,7 +101,7 @@
dnl ---------------------------------------------------
dnl Find libtiff
@@ -62,7 +67,7 @@
saved_LIBS="${LIBS}"

View File

@@ -1,13 +0,0 @@
--- src/framebuffer/Makefile.am.orig Sun Jan 25 04:16:25 2004
+++ src/framebuffer/Makefile.am Fri Jan 30 18:30:57 2004
@@ -1,6 +1,6 @@
lib_LTLIBRARIES = framebuffer.la
-CFLAGS = $(CFLAGS) @X_CFLAGS@
+CFLAGS = @X_CFLAGS@
framebuffer_la_SOURCES = framebuffer.cpp fbx.cpp
framebuffer_la_LIBADD = ../common/libcommon.a @X_LIBS@
framebuffer_la_LDFLAGS = -module @X_LDFLAGS@

View File

@@ -2,7 +2,9 @@ bin/precomp
bin/rndr
bin/sdrc
bin/sdrinfo
bin/show
bin/texmake
include/pixie/dlo.h
include/pixie/dsply.h
include/pixie/implicit.h
include/pixie/ri.h