Update to aqsis 1.8.2. Tied to the Boost update.
From Amit Kulkarni. ok sthen@
This commit is contained in:
parent
81beb76314
commit
6dbb68ed59
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.20 2012/08/04 18:08:21 pascal Exp $
|
||||
# $OpenBSD: Makefile,v 1.21 2013/03/08 01:24:44 brad Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= ${GCC4_ARCHS}
|
||||
|
||||
@ -6,15 +6,13 @@ SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= photorealistic 3D rendering solution
|
||||
|
||||
V= 1.6.0
|
||||
V= 1.8.2
|
||||
DISTNAME= aqsis-${V}
|
||||
REVISION= 5
|
||||
CATEGORIES= graphics
|
||||
|
||||
SO_VERSION= 0.0 # 1.6
|
||||
.for _lib in aqsis_core aqsis_math aqsis_ri2rib aqsis_ribparse \
|
||||
aqsis_riutil aqsis_shadervm aqsis_slcomp aqsis_slxargs aqsis_tex \
|
||||
aqsis_util
|
||||
SO_VERSION= 1.0 # 1.6
|
||||
.for _lib in aqsis_core aqsis_math aqsis_ri2rib aqsis_riutil \
|
||||
aqsis_shadervm aqsis_slcomp aqsis_slxargs aqsis_tex aqsis_util
|
||||
SHARED_LIBS+= ${_lib} ${SO_VERSION}
|
||||
.endfor
|
||||
|
||||
@ -28,9 +26,11 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aqsis/}
|
||||
|
||||
WANTLIB += Half Iex Imath c m stdc++ z fltk tiff IlmImf IlmThread
|
||||
WANTLIB += pthread boost_filesystem-mt boost_iostreams-mt boost_regex-mt
|
||||
WANTLIB += boost_system-mt boost_thread-mt boost_wave-mt tiffxx
|
||||
WANTLIB += GL Half Iex IlmImf IlmThread Imath boost_filesystem-mt
|
||||
WANTLIB += boost_iostreams-mt boost_program_options-mt boost_regex-mt
|
||||
WANTLIB += boost_system-mt boost_thread-mt boost_wave-mt c
|
||||
WANTLIB += lib/qt4/QtCore lib/qt4/QtGui lib/qt4/QtOpenGL
|
||||
WANTLIB += m pthread stdc++ tiff tiffxx z
|
||||
|
||||
MODULES= devel/cmake
|
||||
|
||||
@ -39,10 +39,10 @@ RUN_DEPENDS= devel/desktop-file-utils \
|
||||
x11/gtk+2,-guic
|
||||
BUILD_DEPENDS= textproc/libxslt \
|
||||
devel/bison
|
||||
LIB_DEPENDS= x11/fltk>=1.1.7p2 \
|
||||
devel/boost \
|
||||
LIB_DEPENDS= devel/boost \
|
||||
graphics/tiff \
|
||||
graphics/openexr
|
||||
graphics/openexr \
|
||||
x11/qt4
|
||||
|
||||
NO_REGRESS= Yes
|
||||
MODCMAKE_WANTCOLOR=No
|
||||
|
@ -1,5 +1,2 @@
|
||||
MD5 (aqsis-1.6.0.tar.gz) = McqUC3iUulNvEHxC5IBUHQ==
|
||||
RMD160 (aqsis-1.6.0.tar.gz) = SdM2V5VJIrGuH6nNOoZUke+Kpa0=
|
||||
SHA1 (aqsis-1.6.0.tar.gz) = zQwUFtNvGzxHsu732Nhh/LOKi+U=
|
||||
SHA256 (aqsis-1.6.0.tar.gz) = uUd8dhvIh+S7xvOh0ryl5QjBXPZtd/wNHNQw27m5L6Q=
|
||||
SIZE (aqsis-1.6.0.tar.gz) = 2867634
|
||||
SHA256 (aqsis-1.8.2.tar.gz) = JfZE62nf5vicdvlWFeiXxtdAU/5yzCBpcThV+A55EJg=
|
||||
SIZE (aqsis-1.8.2.tar.gz) = 5669285
|
||||
|
@ -1,20 +1,22 @@
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.1 2010/09/22 12:52:36 ajacoutot Exp $
|
||||
--- CMakeLists.txt.orig Sun Oct 11 14:34:28 2009
|
||||
+++ CMakeLists.txt Tue Sep 21 09:23:56 2010
|
||||
@@ -155,8 +155,8 @@ include(FindResource)
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.2 2013/03/08 01:24:44 brad Exp $
|
||||
--- CMakeLists.txt.orig Tue Nov 20 17:31:42 2012
|
||||
+++ CMakeLists.txt Tue Nov 20 17:33:12 2012
|
||||
@@ -196,8 +196,8 @@ endif()
|
||||
# These are needed by version.h, as well as the packaging stuff. Note that
|
||||
# some packaging variables are set in the platform-specific config files, and
|
||||
# these version variables are potentially used there.
|
||||
-set(VERSION_MAJOR 1)
|
||||
-set(VERSION_MINOR 6)
|
||||
-set(VERSION_MINOR 8)
|
||||
+set(VERSION_MAJOR !!LIBaqsis_core_VERSION_R!!)
|
||||
+set(VERSION_MINOR !!LIBaqsis_core_VERSION_E!!)
|
||||
set(VERSION_BUILD 0)
|
||||
set(VERSION_BUILD 2)
|
||||
set(SCM_REVISION 0) # "?"
|
||||
|
||||
@@ -299,5 +299,4 @@ set(PROCEDURALPATH "${PROCEDURALPATH}" CACHE STRING "A
|
||||
@@ -350,7 +350,6 @@ set(PROCEDURALPATH "${PROCEDURALPATH}" CACHE STRING "A
|
||||
set(RESOURCEPATH "${RESOURCEPATH}" CACHE STRING "Aqsis resource searchpath")
|
||||
set(aqsisrc_name ${PROJECT_BINARY_DIR}/aqsisrc)
|
||||
configure_file(aqsisrc.in.cmake ${aqsisrc_name})
|
||||
-install(FILES ${aqsisrc_name} DESTINATION ${SYSCONFDIR} COMPONENT main)
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Generate an AqsisConfig.cmake file, for use by projects that want to link
|
||||
|
@ -1,10 +1,11 @@
|
||||
@comment $OpenBSD: PLIST,v 1.6 2012/06/15 08:32:16 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.7 2013/03/08 01:24:44 brad Exp $
|
||||
@bin bin/aqsis
|
||||
@bin bin/aqsl
|
||||
@bin bin/aqsltell
|
||||
@bin bin/eqsl
|
||||
@bin bin/miqser
|
||||
@bin bin/piqsl
|
||||
@bin bin/ptview
|
||||
@bin bin/teqser
|
||||
include/aqsis/
|
||||
include/aqsis/aqsis.h
|
||||
@ -13,7 +14,6 @@ include/aqsis/inttype.h
|
||||
include/aqsis/ri/
|
||||
include/aqsis/ri/ndspy.h
|
||||
include/aqsis/ri/ri.h
|
||||
include/aqsis/ri/ri.inl
|
||||
include/aqsis/ri/rif.h
|
||||
include/aqsis/ri/ritypes.h
|
||||
include/aqsis/ri/shadeop.h
|
||||
@ -30,7 +30,6 @@ lib/aqsis/xpm_dspy.so
|
||||
@lib lib/libaqsis_core.so.${LIBaqsis_core_VERSION}
|
||||
@lib lib/libaqsis_math.so.${LIBaqsis_math_VERSION}
|
||||
@lib lib/libaqsis_ri2rib.so.${LIBaqsis_ri2rib_VERSION}
|
||||
@lib lib/libaqsis_ribparse.so.${LIBaqsis_ribparse_VERSION}
|
||||
@lib lib/libaqsis_riutil.so.${LIBaqsis_riutil_VERSION}
|
||||
@lib lib/libaqsis_shadervm.so.${LIBaqsis_shadervm_VERSION}
|
||||
@lib lib/libaqsis_slcomp.so.${LIBaqsis_slcomp_VERSION}
|
||||
@ -43,6 +42,7 @@ share/applications/aqsltell.desktop
|
||||
share/applications/eqsl.desktop
|
||||
share/applications/piqsl.desktop
|
||||
share/aqsis/
|
||||
share/aqsis/doc/
|
||||
share/aqsis/examples/
|
||||
share/aqsis/examples/features/
|
||||
share/aqsis/examples/features/archives/
|
||||
@ -98,6 +98,19 @@ share/aqsis/examples/features/textures/
|
||||
share/aqsis/examples/features/textures/grid.tif
|
||||
share/aqsis/examples/features/textures/render.sh
|
||||
share/aqsis/examples/features/textures/sticky.rib
|
||||
share/aqsis/examples/point_based_gi/
|
||||
share/aqsis/examples/point_based_gi/cornellbox/
|
||||
share/aqsis/examples/point_based_gi/cornellbox/all_passes.rib
|
||||
share/aqsis/examples/point_based_gi/cornellbox/ao.sl
|
||||
share/aqsis/examples/point_based_gi/cornellbox/bake_pass.rib
|
||||
share/aqsis/examples/point_based_gi/cornellbox/bake_points.sl
|
||||
share/aqsis/examples/point_based_gi/cornellbox/beauty_pass.rib
|
||||
share/aqsis/examples/point_based_gi/cornellbox/beauty_pass_ao.rib
|
||||
share/aqsis/examples/point_based_gi/cornellbox/beautycam.rib
|
||||
share/aqsis/examples/point_based_gi/cornellbox/geometry.rib
|
||||
share/aqsis/examples/point_based_gi/cornellbox/indirect.sl
|
||||
share/aqsis/examples/point_based_gi/cornellbox/lights.rib
|
||||
share/aqsis/examples/point_based_gi/cornellbox/shadow_pass.rib
|
||||
share/aqsis/examples/procedurals/
|
||||
share/aqsis/examples/procedurals/menger/
|
||||
share/aqsis/examples/procedurals/menger/README.txt
|
||||
@ -144,6 +157,8 @@ share/aqsis/shaders/
|
||||
share/aqsis/shaders/displacement/
|
||||
share/aqsis/shaders/displacement/AqDMap.sl
|
||||
share/aqsis/shaders/displacement/AqDMap.slx
|
||||
share/aqsis/shaders/displacement/asteroid.sl
|
||||
share/aqsis/shaders/displacement/asteroid.slx
|
||||
share/aqsis/shaders/displacement/borg_metal.sl
|
||||
share/aqsis/shaders/displacement/borg_metal.slx
|
||||
share/aqsis/shaders/displacement/bumpy.sl
|
||||
@ -191,12 +206,10 @@ share/aqsis/shaders/surface/AqSMap.sl
|
||||
share/aqsis/shaders/surface/AqSMap.slx
|
||||
share/aqsis/shaders/surface/DPBlueMarble.sl
|
||||
share/aqsis/shaders/surface/DPBlueMarble.slx
|
||||
share/aqsis/shaders/surface/DPProctext.h
|
||||
share/aqsis/shaders/surface/SpaceTest.sl
|
||||
share/aqsis/shaders/surface/SpaceTest.slx
|
||||
share/aqsis/shaders/surface/cd.sl
|
||||
share/aqsis/shaders/surface/cd.slx
|
||||
share/aqsis/shaders/surface/cddiffract.h
|
||||
share/aqsis/shaders/surface/cellnoisetest.sl
|
||||
share/aqsis/shaders/surface/cellnoisetest.slx
|
||||
share/aqsis/shaders/surface/constant.sl
|
||||
|
Loading…
Reference in New Issue
Block a user