svn commit: r358917 - in head/graphics: . luxrender luxrender/files

Alexey Dokuchaev danfe at FreeBSD.org
Mon Jun 23 10:20:57 UTC 2014 

Author: danfe
Date: Mon Jun 23 10:20:55 2014
New Revision: 358917
URL: http://svnweb.freebsd.org/changeset/ports/358917
QAT: https://qat.redports.org/buildarchive/r358917/

Log:
  Resurrect, unbreak, update to version 1.3.1, and stagify.

Added:
  head/graphics/luxrender/
     - copied from r358907, head/graphics/luxrender/
Modified:
  head/graphics/Makefile
  head/graphics/luxrender/Makefile
  head/graphics/luxrender/distinfo
  head/graphics/luxrender/files/patch-CMakeLists.txt
  head/graphics/luxrender/pkg-plist

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Mon Jun 23 09:59:45 2014	(r358916)
+++ head/graphics/Makefile	Mon Jun 23 10:20:55 2014	(r358917)
@@ -566,6 +566,7 @@
     SUBDIR += lua-gd
     SUBDIR += luminance
     SUBDIR += luxrays
+    SUBDIR += luxrender
     SUBDIR += mahotas
     SUBDIR += makehuman
     SUBDIR += mandelbulber

Modified: head/graphics/luxrender/Makefile
==============================================================================
--- head/graphics/luxrender/Makefile	Mon Jun 23 09:15:54 2014	(r358907)
+++ head/graphics/luxrender/Makefile	Mon Jun 23 10:20:55 2014	(r358917)
@@ -2,67 +2,59 @@
 # $FreeBSD$
 
 PORTNAME=	luxrender
-PORTVERSION=	0.7.1
-PORTREVISION=	7
+PORTVERSION=	1.3.1
 CATEGORIES=	graphics
-MASTER_SITES=	http://src.luxrender.net/lux/archive/ \
-		http://freebsd.nsu.ru/distfiles/luxrender/
-DISTNAME=	${HG_NODEID}
+MASTER_SITES=	http://src.luxrender.net/lux/get/ \
+		http://src.luxrender.net/luxrays/get/:lr
+DISTFILES=	v${PORTVERSION:S/.//g}${EXTRACT_SUFX} \
+		luxrender_v${PORTVERSION}${EXTRACT_SUFX}:lr
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	danfe at FreeBSD.org
 COMMENT=	Physically based and unbiased rendering system
 
-DEPRECATED=	Broken for more than 6 month
-EXPIRATION_DATE=	2013-11-18
-
 LICENSE=	GPLv3
 
-ONLY_FOR_ARCHS=	i386 amd64
-BROKEN=		does not build with boost-1.48.0
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/libfreeimage.a:${PORTSDIR}/graphics/freeimage
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
+LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
+		libfftw3.so:${PORTSDIR}/math/fftw3 \
+		libfreeimage.so:${PORTSDIR}/graphics/freeimage \
 		libpng15.so:${PORTSDIR}/graphics/png \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-
-HG_NODEID=	9206b3ba7011
-
-USE_BZIP2=	yes
-USES=		bison cmake
-WRKSRC=		${WRKDIR}/lux-${HG_NODEID}
-
-DESKTOP_ENTRIES="LuxRender" "${COMMENT}" \
-		"${PREFIX}/share/pixmaps/luxrender.svg" "${PORTNAME}" \
-		"Graphics;3DGraphics;" false
-
-OPTIONS_DEFINE=		QT4 WX
-OPTIONS_DEFAULT=	QT4
-
-QT4_DESC=		Qt4-enabled GUI executable
-WX_DESC=		wxWidgets-enabled GUI executable
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MQT4}
-USE_QT4=	moc_build qmake_build rcc_build uic_build corelib gui
-PLIST_FILES+=	bin/luxrender
+		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+.if !exists(/usr/include/execinfo.h)
+LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 .endif
 
-.if ${PORT_OPTIONS:MWX}
-USE_WX=		2.8+
-PLIST_FILES+=	bin/luxrenderwx
-.endif
+USES=		bison cmake tar:bzip2
+USE_GL=		glut glew
+WRKSRC=		${WRKDIR}/luxrender-lux-${LUX_REV}
+LUXRAYS_WRKSRC=	${WRKDIR}/luxrender-luxrays-${LUXRAYS_REV}
+
+CMAKE_ARGS=	-DLUXRAYS_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \
+		-DLUXRAYS_LIBRARY:STRING="${LUXRAYS_WRKSRC}/lib/libluxrays.a" \
+		-DSLG_INCLUDE_DIRS:PATH="${LUXRAYS_WRKSRC}/include" \
+		-DSLG_LIBRARY:PATH="${LUXRAYS_WRKSRC}/lib/libsmallluxgpu.a" \
+		-DLUXRAYS_DISABLE_OPENCL:BOOL=ON
+
+LUX_REV=	d0b0e20c47cc
+LUXRAYS_REV=	7459cd8a9583
+
+OPTIONS_DEFINE=	X11
+OPTIONS_DEFAULT=	X11
+
+X11_DESC=	Build GUI executable (Qt4-based)
+X11_USE=	QT4=moc_build,qmake_build,rcc_build,uic_build,corelib,gui
+X11_PLIST_FILES=	bin/luxrender
 
 post-patch:
-# Prevent appending `64' suffix to `lib' directory on amd64, do not install
-# vendor .desktop file, disable build of Python extension for now
-	@${REINPLACE_CMD} -e '/LIB_SUFFIX 64/d ; /luxrender\.desktop/d ; \
-		89,95d ; 803,837d' ${WRKSRC}/CMakeLists.txt
-# Adjust for libpng 1.4 new API
-	@${REINPLACE_CMD} -e \
-		's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
-		-e 's|int_p_NULL|NULL|g' ${WRKSRC}/core/external/cimg.h
+	@${REINPLACE_CMD} -e 's/__APPLE__/__FreeBSD__/' \
+		${LUXRAYS_WRKSRC}/samples/smallluxgpu4/smallluxgpu.h \
+		${WRKSRC}/core/osfunc.h \
+		${WRKSRC}/shapes/mikktspace/weldmesh.c
+
+pre-configure:
+	cd ${LUXRAYS_WRKSRC} && ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} \
+		${CMAKE_ARGS} .
+	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+		${_MAKE_JOBS} ${MAKE_ARGS} -C ${LUXRAYS_WRKSRC}
 
 .include <bsd.port.mk>

Modified: head/graphics/luxrender/distinfo
==============================================================================
--- head/graphics/luxrender/distinfo	Mon Jun 23 09:15:54 2014	(r358907)
+++ head/graphics/luxrender/distinfo	Mon Jun 23 10:20:55 2014	(r358917)
@@ -1,2 +1,4 @@
-SHA256 (luxrender/9206b3ba7011.tar.bz2) = 8af12fbebf29e62f3203b02fe28a11304f7d48f23f87e7a053c804149cbfcc56
-SIZE (luxrender/9206b3ba7011.tar.bz2) = 1998376
+SHA256 (luxrender/v131.tar.bz2) = b38fb83e0e9a8bc09587ac78de688f9a79fbbe9e2e20ff5822bc72a24bb230fd
+SIZE (luxrender/v131.tar.bz2) = 2541070
+SHA256 (luxrender/luxrender_v1.3.1.tar.bz2) = bae72176f33e4c307cba3f03c332024b6c46ea5d88251e14f5c748a6b0626bc5
+SIZE (luxrender/luxrender_v1.3.1.tar.bz2) = 44433304

Modified: head/graphics/luxrender/files/patch-CMakeLists.txt
==============================================================================
--- head/graphics/luxrender/files/patch-CMakeLists.txt	Mon Jun 23 09:15:54 2014	(r358907)
+++ head/graphics/luxrender/files/patch-CMakeLists.txt	Mon Jun 23 10:20:55 2014	(r358917)
@@ -1,56 +1,20 @@
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -842,18 +841,6 @@
- 
- #############################################################################
- #############################################################################
--###########################      Find OpenGL       ##########################
--#############################################################################
--#############################################################################
--SET(OPENGL_LIBRARY ${CMAKE_ROOT}/Modules/FindOpenGL.cmake)
--INCLUDE(${CMAKE_ROOT}/Modules/FindOpenGL.cmake)
--
--MESSAGE(STATUS "OpenGL include directory: " ${OPENGL_INCLUDE_DIR})
--
--INCLUDE_DIRECTORIES(SYSTEM ${OPENGL_INCLUDE_DIR})
--
--#############################################################################
--#############################################################################
- ######################### wxWidgets LIBRARIES SETUP #########################
- #############################################################################
- #############################################################################
-@@ -864,6 +851,11 @@
- FIND_PACKAGE(wxWidgets)
- 
- IF(wxWidgets_FOUND)
-+	SET(OPENGL_LIBRARY ${CMAKE_ROOT}/Modules/FindOpenGL.cmake)
-+	INCLUDE(${CMAKE_ROOT}/Modules/FindOpenGL.cmake)
-+	MESSAGE(STATUS "OpenGL include directory: " ${OPENGL_INCLUDE_DIR})
-+	INCLUDE_DIRECTORIES(SYSTEM ${OPENGL_INCLUDE_DIR})
-+
- 	# Include wxWidgets macros
- 	INCLUDE(${wxWidgets_USE_FILE})
- 	MESSAGE( STATUS "wxWidgets include directory: " ${wxWidgets_INCLUDE_DIRS} )
-@@ -955,16 +947,14 @@
- 
- #############################################################################
- 
--#Install target
-+#Install targets
- IF(wxWidgets_FOUND)
--	INSTALL(TARGETS luxrender luxrenderwx luxconsole luxmerger
--      	  RUNTIME DESTINATION bin
--	)
--ELSE(wxWidgets_FOUND)
--	INSTALL(TARGETS luxrender luxconsole luxmerger
--      	  RUNTIME DESTINATION bin
--	)
-+	INSTALL(TARGETS luxrenderwx RUNTIME DESTINATION bin)
- ENDIF(wxWidgets_FOUND)
-+IF(QT4_FOUND)
-+	INSTALL(TARGETS luxrender RUNTIME DESTINATION bin)
-+ENDIF(QT4_FOUND)
-+INSTALL(TARGETS luxconsole luxmerger RUNTIME DESTINATION bin)
- 
- #Install API/Library
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/core/api.h DESTINATION include/luxrender/)
+@@ -179,7 +179,7 @@ IF(NOT APPLE AND NOT WIN32)
+ 	STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _mach_x86_64 ${MACHINE})
+ 	IF (_mach_x86_64)
+ 		SET(ARCH_X86_64 1)
+-		SET(LIB_SUFFIX 64)
++		#SET(LIB_SUFFIX 64)
+ 		#jromang - Hack to avoid boost bug on x64  Ubuntu 8.10 and Fedora 10 (http://www.luxrender.net/mantis/view.php?id=433)
+ 		ADD_DEFINITIONS(-DBOOST_NO_INTRINSIC_INT64_T)
+ 	ENDIF (_mach_x86_64)
+@@ -298,7 +298,7 @@ ELSEIF(MSVC)
+ ELSE(APPLE)
+ 	# Dade - default compiler options
+ 	# Removed "-O3" from definitions in order to have CMake Release/Debug options to work
+-	ADD_DEFINITIONS(-msse2 -mfpmath=sse -ftree-vectorize -funroll-loops -Wall -fPIC -DHAVE_PTHREAD_H)
++	ADD_DEFINITIONS(-Wall -fPIC -DHAVE_PTHREAD_H)
+ 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fvisibility=hidden -fvisibility-inlines-hidden")
+ 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fvisibility=hidden -fvisibility-inlines-hidden")
+ 	# The QBVH accelerator needs to be compiled with much reduced optimizations

Modified: head/graphics/luxrender/pkg-plist
==============================================================================
--- head/graphics/luxrender/pkg-plist	Mon Jun 23 09:15:54 2014	(r358907)
+++ head/graphics/luxrender/pkg-plist	Mon Jun 23 10:20:55 2014	(r358917)
@@ -2,5 +2,6 @@ bin/luxconsole
 bin/luxmerger
 include/luxrender/api.h
 @dirrm include/luxrender
-lib/liblux.a
+lib/liblux.so
 share/pixmaps/luxrender.svg
+share/applications/luxrender.desktop

More information about the svn-ports-head mailing list