Date: Tue, 24 Nov 2015 16:33:15 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402368 - in head/graphics: luxrender luxrender14 Message-ID: <201511241633.tAOGXF2D007243@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Nov 24 16:33:15 2015 New Revision: 402368 URL: https://svnweb.freebsd.org/changeset/ports/402368 Log: - Update to version 1.5.1 which fixes a few annoying issues with glossy materials when using the new LuxCore rendering modes - Because upstream did not use different tag names for LuxCore and LuxRender this time, avoid distfile name clash by using .tar.gz format for smaller distfile (3.1M) and .tar.bz2 for the larger one (28M) - Ensure that correct build number is reported in the "About" dialog box - Fix USES and DISTVERSION check for version 1.4 support while I'm here Modified: head/graphics/luxrender/Makefile head/graphics/luxrender/distinfo head/graphics/luxrender14/Makefile Modified: head/graphics/luxrender/Makefile ============================================================================== --- head/graphics/luxrender/Makefile Tue Nov 24 16:07:28 2015 (r402367) +++ head/graphics/luxrender/Makefile Tue Nov 24 16:33:15 2015 (r402368) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= luxrender -DISTVERSION?= 1.5 +DISTVERSION?= 1.5.1 CATEGORIES= graphics MASTER_SITES= https://bitbucket.org/luxrender/lux/get/ \ https://bitbucket.org/luxrender/luxrays/get/:lr -DISTFILES= v${DISTVERSION:C/[.-]//g}${EXTRACT_SUFX} \ +DISTFILES?= ${PORTNAME}_v${DISTVERSION}.tar.gz \ ${PORTNAME}_v${DISTVERSION:S/-//}${EXTRACT_SUFX}:lr DIST_SUBDIR= ${PORTNAME} @@ -19,14 +19,14 @@ LIB_DEPENDS= libboost_python.so:${PORTSD libfftw3.so:${PORTSDIR}/math/fftw3 \ libfreeimage.so:${PORTSDIR}/graphics/freeimage \ libOpenImageIO.so:${PORTSDIR}/graphics/openimageio -.if ${DISTVERSION} > 1.4 +.if ${DISTVERSION} != 1.4 LIB_DEPENDS+= libembree.so:${PORTSDIR}/graphics/embree .endif ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= uses SSE instructions -USES= bison cmake execinfo python:version tar:bzip2 +USES= bison cmake execinfo python:build tar:bzip2 USE_GL= glut glew WRKSRC= ${WRKDIR}/${PORTNAME}-lux-${LUX_REV} LUXRAYS_WRKSRC= ${WRKDIR}/${PORTNAME}-luxrays-${LUXRAYS_REV} @@ -39,8 +39,8 @@ CMAKE_ARGS= -DLUXCORE_INCLUDE_DIRS:PATH= -DSLG_LIBRARY:PATH="${LUXRAYS_WRKSRC}/lib/libsmallluxgpu.a" \ -DLUXRAYS_DISABLE_OPENCL:BOOL=ON -LUX_REV?= 216e294b59e3 -LUXRAYS_REV?= 3674460aa1da +LUX_REV?= 8dabcd6b7016 +LUXRAYS_REV?= 8577ff287efb OPTIONS_DEFINE= X11 OPTIONS_DEFAULT= X11 @@ -66,6 +66,7 @@ post-patch: ${WRKSRC}/cmake/pylux.cmake pre-configure: + -${PYTHON_CMD} ${WRKSRC}/makeBuildNumber.py ${WRKSRC}/core/version.h cd ${LUXRAYS_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \ ${CMAKE_ARGS} . ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \ Modified: head/graphics/luxrender/distinfo ============================================================================== --- head/graphics/luxrender/distinfo Tue Nov 24 16:07:28 2015 (r402367) +++ head/graphics/luxrender/distinfo Tue Nov 24 16:33:15 2015 (r402368) @@ -1,4 +1,4 @@ -SHA256 (luxrender/v15.tar.bz2) = 5336ef37388e68414aa6f6e2ad43df5aa384e1cb7d73b2f68b4be02d10adade4 -SIZE (luxrender/v15.tar.bz2) = 2419335 -SHA256 (luxrender/luxrender_v1.5.tar.bz2) = 6aea4af2faa09460f8e77997e40855a8f978f15a4ddebdc6d67ee7bbf127d04f -SIZE (luxrender/luxrender_v1.5.tar.bz2) = 29612786 +SHA256 (luxrender/luxrender_v1.5.1.tar.gz) = 6f55594759c7580bc9b08d517fc23a4e7c2e2195e8ad367e87ba1a3a2216f3e2 +SIZE (luxrender/luxrender_v1.5.1.tar.gz) = 3267994 +SHA256 (luxrender/luxrender_v1.5.1.tar.bz2) = 551ce7506f04a51f59c262cb47dd03db5db1d4a0d3cd7f43d7b4dbb10ddd94cc +SIZE (luxrender/luxrender_v1.5.1.tar.bz2) = 29613457 Modified: head/graphics/luxrender14/Makefile ============================================================================== --- head/graphics/luxrender14/Makefile Tue Nov 24 16:07:28 2015 (r402367) +++ head/graphics/luxrender14/Makefile Tue Nov 24 16:33:15 2015 (r402368) @@ -2,6 +2,8 @@ # $FreeBSD$ DISTVERSION= 1.4 +DISTFILES= v${DISTVERSION:C/[.-]//g}${EXTRACT_SUFX} \ + ${PORTNAME}_v${DISTVERSION:S/-//}${EXTRACT_SUFX}:lr LUX_REV= dfd211d6faa0 LUXRAYS_REV= 7c7127ee1fa4
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511241633.tAOGXF2D007243>