Index: branches/2018Q4/cad/openvsp/Makefile =================================================================== --- branches/2018Q4/cad/openvsp/Makefile (revision 485521) +++ branches/2018Q4/cad/openvsp/Makefile (revision 485522) @@ -1,92 +1,70 @@ # $FreeBSD$ PORTNAME= openvsp DISTVERSIONPREFIX= ${GH_PROJECT}_ DISTVERSION= 3.16.1 PORTREVISION= 1 CATEGORIES= cad MAINTAINER= fernape@FreeBSD.org COMMENT= Create a 3D model of an aircraft defined by engineering parameters LICENSE= NOSA13 LICENSE_NAME= NASA Open Source Agreement version 1.3 LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_aarch64= fails to compile: invokes x86 asm BROKEN_armv6= fails to compile: invokes x86 asm BROKEN_armv7= fails to compile: invokes x86 asm LIB_DEPENDS= libdrm.so:graphics/libdrm \ libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ libfltk.so:x11-toolkits/fltk \ libGLEW.so:graphics/glew \ libcpptest.so:devel/cpptest BUILD_DEPENDS= ${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs \ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs -CMAKE_SOURCE_PATH= ${WRKSRC}/SuperProject -CMAKE_INSTALL_PREFIX= ${STAGEDIR}${PREFIX} +USES= compiler:c++11-lang cmake:outsource,noninja localbase\ + gl gnome jpeg -USES= cmake:outsource,noninja jpeg - USE_GITHUB= yes GH_PROJECT= OpenVSP GH_ACCOUNT= ${GH_PROJECT} -# On FreeBSD < 11 libc++ lacks support for sized delete operators. -# GCC dropped the builtin version of these operators in 6+ by -# defaulting to gnu++14. Force c++11 instead. -# For a more detailed discussion see: -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219484 -USE_CXXSTD= gnu++11 - +CMAKE_SOURCE_PATH= ${WRKSRC}/SuperProject +CMAKE_INSTALL_PREFIX= ${STAGEDIR}${PREFIX} CMAKE_ARGS= -DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \ -DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \ -DVSP_USE_SYSTEM_CODEELI:BOOLEAN=no \ -DVSP_USE_SYSTEM_EIGEN:BOOLEAN=no \ -DVSP_USE_SYSTEM_LIBXML2:BOOLEAN=yes \ -DVSP_USE_SYSTEM_FLTK:boolean=yes \ -DVSP_USE_SYSTEM_CMINPACK:boolean=no \ -DVSP_USE_SYSTEM_GLM:BOOLEAN=yes \ -DVSP_USE_SYSTEM_GLEW:BOOLEAN=yes USE_XORG= ice sm x11 xau xcb xdamage xdmcp xext xfixes xft \ xinerama xrender xxf86vm USE_GL= gl glu USE_GNOME= libxml2 -CFLAGS+= -I${LOCALBASE}/include/openNURBS .include - -# In 12 gcc can not compile the port so switch to clang 5.0.0 in base. -# But wait! It crashes while compiling so apply a patch to avoid weird asm code -# that makes clang die -# For details see: -# https://lists.freebsd.org/pipermail/freebsd-hackers/2017-August/051352.html - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 -USES+= compiler:c++11-lib -EXTRA_PATCHES= ${FILESDIR}/extra-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp -CFLAGS+= -I${LOCALBASE}/include -.else -USES+= compiler:gcc-c++11-lib -.endif BUILD_PREFIX= OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenVSP-${DISTVERSION}-FreeBSD do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${BUILD_PREFIX}/vsp* ${STAGEDIR}${PREFIX}/bin @${STRIP_CMD} ${STAGEDIR}/${PREFIX}/vsp* @${MKDIR} ${STAGEDIR}${DATADIR} .for d in CustomScripts airfoil matlab scripts textures (cd ${BUILD_WRKSRC}/${BUILD_PREFIX}/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) .endfor ${CP} ${BUILD_WRKSRC}/${BUILD_PREFIX}/LICENSE ${STAGEDIR}${DATADIR} .include Index: branches/2018Q4/cad/openvsp/files/extra-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp =================================================================== --- branches/2018Q4/cad/openvsp/files/extra-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp (revision 485521) +++ branches/2018Q4/cad/openvsp/files/extra-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp (nonexistent) @@ -1,164 +0,0 @@ ---- src/external/angelscript/sdk/angelscript/source/as_callfunc_x86.cpp.orig 2017-08-02 20:09:54 UTC -+++ src/external/angelscript/sdk/angelscript/source/as_callfunc_x86.cpp -@@ -340,7 +340,7 @@ endcopy: - volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func)}; - - asm __volatile__( --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // When compiled with optimizations the stack unwind doesn't work properly, - // causing exceptions to crash the application. By adding this prologue - // and the epilogue below, the stack unwind works as it should. -@@ -385,7 +385,7 @@ endcopy: - // Pop the alignment bytes - "popl %%esp \n" - "popl %%ebx \n" --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // Epilogue - "movl %%ebp, %%esp \n" - ".cfi_def_cfa_register esp \n" -@@ -462,7 +462,7 @@ endcopy: - volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)}; - - asm __volatile__ ( --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // When compiled with optimizations the stack unwind doesn't work properly, - // causing exceptions to crash the application. By adding this prologue - // and the epilogue below, the stack unwind works as it should. -@@ -508,7 +508,7 @@ endcopy: - // Pop the alignment bytes - "popl %%esp \n" - "popl %%ebx \n" --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // Epilogue - "movl %%ebp, %%esp \n" - ".cfi_def_cfa_register esp \n" -@@ -585,7 +585,7 @@ endcopy: - volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)}; - - asm __volatile__ ( --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // When compiled with optimizations the stack unwind doesn't work properly, - // causing exceptions to crash the application. By adding this prologue - // and the epilogue below, the stack unwind works as it should. -@@ -631,7 +631,7 @@ endcopy: - // Pop the alignment bytes - "popl %%esp \n" - "popl %%ebx \n" --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // Epilogue - "movl %%ebp, %%esp \n" - ".cfi_def_cfa_register esp \n" -@@ -717,7 +717,7 @@ endcopy: - volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)}; - - asm __volatile__ ( --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // When compiled with optimizations the stack unwind doesn't work properly, - // causing exceptions to crash the application. By adding this prologue - // and the epilogue below, the stack unwind works as it should. -@@ -767,7 +767,7 @@ endcopy: - // Pop the alignment bytes - "popl %%esp \n" - "popl %%ebx \n" --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // Epilogue - "movl %%ebp, %%esp \n" - ".cfi_def_cfa_register esp \n" -@@ -849,7 +849,7 @@ endcopy: - volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)}; - - asm __volatile__ ( --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // When compiled with optimizations the stack unwind doesn't work properly, - // causing exceptions to crash the application. By adding this prologue - // and the epilogue below, the stack unwind works as it should. -@@ -896,7 +896,7 @@ endcopy: - // Pop the alignment bytes - "popl %%esp \n" - "popl %%ebx \n" --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // Epilogue - "movl %%ebp, %%esp \n" - ".cfi_def_cfa_register esp \n" -@@ -980,7 +980,7 @@ endcopy: - volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)}; - - asm __volatile__ ( --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // When compiled with optimizations the stack unwind doesn't work properly, - // causing exceptions to crash the application. By adding this prologue - // and the epilogue below, the stack unwind works as it should. -@@ -1030,7 +1030,7 @@ endcopy: - // Pop the alignment bytes - "popl %%esp \n" - "popl %%ebx \n" --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // Epilogue - "movl %%ebp, %%esp \n" - ".cfi_def_cfa_register esp \n" -@@ -1102,7 +1102,7 @@ endcopy: - volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func)}; - - asm __volatile__ ( --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // When compiled with optimizations the stack unwind doesn't work properly, - // causing exceptions to crash the application. By adding this prologue - // and the epilogue below, the stack unwind works as it should. -@@ -1145,7 +1145,7 @@ endcopy: - // Pop the alignment bytes - "popl %%esp \n" - "popl %%ebx \n" --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // Epilogue - "movl %%ebp, %%esp \n" - ".cfi_def_cfa_register esp \n" -@@ -1233,7 +1233,7 @@ endcopy: - volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)}; - - asm __volatile__ ( --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // When compiled with optimizations the stack unwind doesn't work properly, - // causing exceptions to crash the application. By adding this prologue - // and the epilogue below, the stack unwind works as it should. -@@ -1285,7 +1285,7 @@ endcopy: - // Pop the alignment bytes - "popl %%esp \n" - "popl %%ebx \n" --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // Epilogue - "movl %%ebp, %%esp \n" - ".cfi_def_cfa_register esp \n" -@@ -1380,7 +1380,7 @@ endcopy: - volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)}; - - asm __volatile__ ( --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // When compiled with optimizations the stack unwind doesn't work properly, - // causing exceptions to crash the application. By adding this prologue - // and the epilogue below, the stack unwind works as it should. -@@ -1445,7 +1445,7 @@ endcopy: - // Pop the alignment bytes - "popl %%esp \n" - "popl %%ebx \n" --#ifdef __OPTIMIZE__ -+#if defined(__OPTIMIZE__) && !defined(__clang__) - // Epilogue - "movl %%ebp, %%esp \n" - ".cfi_def_cfa_register esp \n" Property changes on: branches/2018Q4/cad/openvsp/files/extra-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2018Q4/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp =================================================================== --- branches/2018Q4/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp (nonexistent) +++ branches/2018Q4/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp (revision 485522) @@ -0,0 +1,164 @@ +--- src/external/angelscript/sdk/angelscript/source/as_callfunc_x86.cpp.orig 2017-08-02 20:09:54 UTC ++++ src/external/angelscript/sdk/angelscript/source/as_callfunc_x86.cpp +@@ -340,7 +340,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func)}; + + asm __volatile__( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -385,7 +385,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -462,7 +462,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -508,7 +508,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -585,7 +585,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -631,7 +631,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -717,7 +717,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -767,7 +767,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -849,7 +849,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -896,7 +896,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -980,7 +980,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -1030,7 +1030,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -1102,7 +1102,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -1145,7 +1145,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -1233,7 +1233,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -1285,7 +1285,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -1380,7 +1380,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -1445,7 +1445,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" Property changes on: branches/2018Q4/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q4 =================================================================== --- branches/2018Q4 (revision 485521) +++ branches/2018Q4 (revision 485522) Property changes on: branches/2018Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r485187