Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 15 Feb 2020 08:58:11 +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: r526212 - in head/graphics: . seexpr seexpr/files
Message-ID:  <202002150858.01F8wBVV016146@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Sat Feb 15 08:58:11 2020
New Revision: 526212
URL: https://svnweb.freebsd.org/changeset/ports/526212

Log:
  - Resurrect and update to version 3.0.1 which is based on Qt5
    now and officially requires C++11-capable compiler
  - Disable LLVM backend and Python support for the moment, due
    to outstanding build issues
  - Respect WITH_DEBUG when passing `-g' option to the compiler

Added:
  head/graphics/seexpr/
     - copied from r495966, head/graphics/seexpr/
Deleted:
  head/graphics/seexpr/files/
Modified:
  head/graphics/Makefile
  head/graphics/seexpr/Makefile
  head/graphics/seexpr/distinfo
  head/graphics/seexpr/pkg-plist

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Sat Feb 15 08:56:17 2020	(r526211)
+++ head/graphics/Makefile	Sat Feb 15 08:58:11 2020	(r526212)
@@ -968,6 +968,7 @@
     SUBDIR += sdl_ttf
     SUBDIR += sdump
     SUBDIR += seejpeg
+    SUBDIR += seexpr
     SUBDIR += sekrit-twc-zimg
     SUBDIR += seom
     SUBDIR += separate

Modified: head/graphics/seexpr/Makefile
==============================================================================
--- head/graphics/seexpr/Makefile	Sat Mar 16 21:52:35 2019	(r495966)
+++ head/graphics/seexpr/Makefile	Sat Feb 15 08:58:11 2020	(r526212)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	seexpr
+PORTVERSION=	3.0.1
 DISTVERSIONPREFIX=	v
-PORTVERSION=	2.11
-PORTREVISION=	5
 CATEGORIES=	graphics math
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -12,28 +11,30 @@ COMMENT=	Embeddable expression evaluation language
 
 LICENSE=	APACHE20
 
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wdas
 GH_PROJECT=	SeExpr
 
-USES=		bison cmake compiler:c++0x pyqt:4 python:2.7 qt:4
-USE_PYQT=	gui_build sip_build
-USE_QT=		moc_build qmake_build rcc_build uic_build gui opengl
-BINARY_ALIAS=	sip=sip-${PYTHON_VER}
+USES=		bison cmake compiler:c++11-lang gl qt:5
+USE_GL=		gl glu
+USE_LDCONFIG=	yes
+USE_QT=		buildtools_build qmake_build core gui opengl widgets
 
 MAKE_JOBS_UNSAFE=	yes	# https://github.com/wdas/seexpr/issues/40
 
-CXXFLAGS+=	-I${LOCALBASE}/include
+# XXX: fix the build errors and convert to OPTIONs
+CMAKE_ARGS=	-DENABLE_LLVM_BACKEND:BOOL=FALSE -DUSE_PYTHON:BOOL=FALSE
 
-.if ${MACHINE_CPU:Msse41}
-CMAKE_ARGS+=	-DUSE_SSE41:BOOL=ON
+.if ! ${MACHINE_CPU:Msse41}
+CMAKE_ARGS+=	-DENABLE_SSE4:BOOL=FALSE
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/<alloca\.h>/d' ${WRKSRC}/src/SeExpr/SePlatform.h
-	@${REINPLACE_CMD} -e 's, "dl",,' ${WRKSRC}/src/SeExpr/CMakeLists.txt
+	@${REINPLACE_CMD} -e '/<alloca\.h>/d' ${WRKSRC}/src/SeExpr2/Platform.h
+.if !defined(WITH_DEBUG)
+	@${REINPLACE_CMD} -e 's/-g //' ${WRKSRC}/CMakeLists.txt
+.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/seexpr/distinfo
==============================================================================
--- head/graphics/seexpr/distinfo	Sat Mar 16 21:52:35 2019	(r495966)
+++ head/graphics/seexpr/distinfo	Sat Feb 15 08:58:11 2020	(r526212)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467059439
-SHA256 (wdas-SeExpr-v2.11_GH0.tar.gz) = bf4a498f86aa3fc19aad3d7384de11d5df76f7f71587c9bd789f5e50f8090e1a
-SIZE (wdas-SeExpr-v2.11_GH0.tar.gz) = 709354
+TIMESTAMP = 1570122938
+SHA256 (wdas-SeExpr-v3.0.1_GH0.tar.gz) = 1e4cd35e6d63bd3443e1bffe723dbae91334c2c94a84cc590ea8f1886f96f84e
+SIZE (wdas-SeExpr-v3.0.1_GH0.tar.gz) = 903297

Modified: head/graphics/seexpr/pkg-plist
==============================================================================
--- head/graphics/seexpr/pkg-plist	Sat Mar 16 21:52:35 2019	(r495966)
+++ head/graphics/seexpr/pkg-plist	Sat Feb 15 08:58:11 2020	(r526212)
@@ -1,41 +1,111 @@
-bin/asciiCalc
-bin/asciiGraph
-bin/imageEditor
-bin/imageSynth
-include/SeContext.h
-include/SeCurve.h
-include/SeExprBuiltins.h
-include/SeExprEditor/SeExprEdBrowser.h
-include/SeExprEditor/SeExprEdColorCurve.h
-include/SeExprEditor/SeExprEdColorSwatchWidget.h
-include/SeExprEditor/SeExprEdControl.h
-include/SeExprEditor/SeExprEdControlCollection.h
-include/SeExprEditor/SeExprEdCurve.h
-include/SeExprEditor/SeExprEdDialog.h
-include/SeExprEditor/SeExprEdFileDialog.h
-include/SeExprEditor/SeExprEdGrapher2d.h
-include/SeExprEditor/SeExprEdPopupDocumentation.h
-include/SeExprEditor/SeExprEdShortEdit.h
-include/SeExprEditor/SeExprEditor.h
-include/SeExprFunc.h
-include/SeExprMacros.h
-include/SeExprNode.h
-include/SeExprParser.h
-include/SeExpression.h
-include/SeMutex.h
-include/SeNoise.h
-include/SeNoiseTables.h
-include/SePlatform.h
-include/SeVec3d.h
-lib/libSeExpr.a
-lib/libSeExpr.so
-lib/libSeExprEditor.so
-%%PYTHON_SITELIBDIR%%/SeExpr/__init__.py
-%%PYTHON_SITELIBDIR%%/SeExpr/expreditor.so
-share/SeExpr/demo/segraph
-share/SeExpr/expressions/fbm.se
-share/SeExpr/expressions/noise.se
-share/SeExpr/expressions/noisecolor1.se
-share/SeExpr/expressions/noisecolor2.se
-share/SeExpr/expressions/raytrace.se
-share/SeExpr/expressions/sinc.se
+bin/asciiCalc2
+bin/asciiGraph2
+bin/imageEditor2
+bin/imageSynth2
+bin/imageSynthPaint3d2
+include/SeExpr2/Context.h
+include/SeExpr2/ContextUtils.h
+include/SeExpr2/Curve.h
+include/SeExpr2/Evaluator.h
+include/SeExpr2/ExprBuiltins.h
+include/SeExpr2/ExprConfig.h
+include/SeExpr2/ExprEnv.h
+include/SeExpr2/ExprFunc.h
+include/SeExpr2/ExprFuncStandard.h
+include/SeExpr2/ExprFuncX.h
+include/SeExpr2/ExprLLVM.h
+include/SeExpr2/ExprLLVMAll.h
+include/SeExpr2/ExprMultiExpr.h
+include/SeExpr2/ExprNode.h
+include/SeExpr2/ExprParser.h
+include/SeExpr2/ExprPatterns.h
+include/SeExpr2/ExprType.h
+include/SeExpr2/ExprWalker.h
+include/SeExpr2/Expression.h
+include/SeExpr2/Interpreter.h
+include/SeExpr2/Mutex.h
+include/SeExpr2/Noise.h
+include/SeExpr2/NoiseTables.h
+include/SeExpr2/Platform.h
+include/SeExpr2/SeContext.h
+include/SeExpr2/SeExprMacros.h
+include/SeExpr2/StringUtils.h
+include/SeExpr2/UI/BasicExpression.h
+include/SeExpr2/UI/ControlSpec.h
+include/SeExpr2/UI/Editable.h
+include/SeExpr2/UI/EditableExpression.h
+include/SeExpr2/UI/ExprBrowser.h
+include/SeExpr2/UI/ExprColorCurve.h
+include/SeExpr2/UI/ExprColorSwatch.h
+include/SeExpr2/UI/ExprCompletionModel.h
+include/SeExpr2/UI/ExprControl.h
+include/SeExpr2/UI/ExprControlCollection.h
+include/SeExpr2/UI/ExprCurve.h
+include/SeExpr2/UI/ExprDeepWater.h
+include/SeExpr2/UI/ExprDialog.h
+include/SeExpr2/UI/ExprEditor.h
+include/SeExpr2/UI/ExprFileDialog.h
+include/SeExpr2/UI/ExprGrapher2d.h
+include/SeExpr2/UI/ExprHelp.h
+include/SeExpr2/UI/ExprHighlighter.h
+include/SeExpr2/UI/ExprPopupDoc.h
+include/SeExpr2/UI/ExprShortEdit.h
+include/SeExpr2/UI/ExprSpecType.h
+include/SeExpr2/UI/generated/ExprSpecParser.tab.h
+include/SeExpr2/VarBlock.h
+include/SeExpr2/Vec.h
+include/SeExpr2/generated/ExprParser.tab.h
+include/SeExpr2/parser/ASTNode.h
+include/SeExpr2/parser/SeExprLex.h
+include/SeExpr2/parser/SeExprParse.h
+include/SeExpr2/seexpr2_export.h
+lib/libSeExpr2.so
+lib/libSeExpr2.so.2
+lib/libSeExpr2.so.2.0
+lib/libSeExpr2Editor.so
+lib/libSeExpr2Editor.so.2.0
+lib/libSeExpr2Editor.so.3
+share/SeExpr2/demos/imageSynth/examples/111.se
+share/SeExpr2/demos/imageSynth/examples/fbm.se
+share/SeExpr2/demos/imageSynth/examples/noise.se
+share/SeExpr2/demos/imageSynth/examples/noisecolor1.se
+share/SeExpr2/demos/imageSynth/examples/noisecolor2.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/RemapShadowContribution.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/bark_eucalyptusColor.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/bark_eucalyptusDisp.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/blackToWhite.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/candycane.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/color_noise.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/dither_with_gamma.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/freakles.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/lines.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/rope_Basic.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/scaleTool.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/select_byColorDark.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/select_byThreshold.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/textureI_nstancerCircular.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/texture_Instancer.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/texture_Tiler.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/threads.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/threshold.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/uv_testPattern.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/wood_Nicks.se
+share/SeExpr2/demos/imageSynth/examples/paint3d_test/xyz_colorNoise.se
+share/SeExpr2/demos/imageSynth/examples/raytrace.se
+share/SeExpr2/demos/imageSynth/examples/run.sh
+share/SeExpr2/demos/imageSynth/examples/sinc.se
+share/SeExpr2/demos/imageSynth/examples/test.se
+share/SeExpr2/expressions/fbm.se
+share/SeExpr2/expressions/noise.se
+share/SeExpr2/expressions/noisecolor1.se
+share/SeExpr2/expressions/noisecolor2.se
+share/SeExpr2/expressions/raytrace.se
+share/SeExpr2/expressions/sinc.se
+share/SeExpr2/utils/eval
+share/SeExpr2/utils/listVar
+share/cmake/SeExpr2/seexpr2-config.cmake
+share/cmake/SeExpr2/seexpr2-version.cmake
+share/pkgconfig/seexpr2.pc
+share/test/SeExpr2/BlockTests
+share/test/SeExpr2/VarBlockExample
+share/test/SeExpr2/dirtSimple



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002150858.01F8wBVV016146>