pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
openscad current: import current openscad using wip/cgal-4.11
Module Name: pkgsrc-wip
Committed By: i3enedek <pkgsrc%xn--rvztrtkrfrgp-bbb7j2b8f0b9d7a21oft.com@localhost>
Pushed By: i3enedek
Date: Mon Mar 19 18:32:02 2018 +0000
Changeset: f4db513a764b2e4014c444de2d188a45072ef523
Added Files:
openscad/DESCR
openscad/Makefile
openscad/PLIST
openscad/distinfo
openscad/patches/patch-openscad.pro
openscad/patches/patch-src_ModuleCache.cc
openscad/patches/patch-src_StatCache.cc
openscad/patches/patch-src_colormap.h
openscad/patches/patch-src_scintillaeditor.h
Log Message:
openscad current: import current openscad using wip/cgal-4.11
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f4db513a764b2e4014c444de2d188a45072ef523
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
openscad/DESCR | 23 ++++++
openscad/Makefile | 49 ++++++++++++
openscad/PLIST | 111 +++++++++++++++++++++++++++
openscad/distinfo | 11 +++
openscad/patches/patch-openscad.pro | 14 ++++
openscad/patches/patch-src_ModuleCache.cc | 12 +++
openscad/patches/patch-src_StatCache.cc | 27 +++++++
openscad/patches/patch-src_colormap.h | 16 ++++
openscad/patches/patch-src_scintillaeditor.h | 15 ++++
9 files changed, 278 insertions(+)
diffs:
diff --git a/openscad/DESCR b/openscad/DESCR
new file mode 100644
index 0000000000..82f059439d
--- /dev/null
+++ b/openscad/DESCR
@@ -0,0 +1,23 @@
+OpenSCAD is a software for creating solid 3D CAD objects. It is free software
+and available for Linux/UNIX, MS Windows and Mac OS X.
+
+Unlike most free software for creating 3D models (such as the famous
+application Blender) it does not focus on the artistic aspects of 3D modelling
+but instead on the CAD aspects. Thus it might be the application you are
+looking for when you are planning to create 3D models of machine parts but
+pretty sure is not what you are looking for when you are more interested in
+creating computer-animated movies.
+
+OpenSCAD is not an interactive modeller. Instead it is something like a
+3D-compiler that reads in a script file that describes the object and renders
+the 3D model from this script file (see examples below). This gives you (the
+designer) full control over the modelling process and enables you to easily
+change any step in the modelling process or make designes that are defined by
+configurable parameters.
+
+OpenSCAD provides two main modelling techniques: First there is constructive
+solid geometry (aka CSG) and second there is extrusion of 2D outlines. As data
+exchange format format for this 2D outlines Autocad DXF files are used. In
+addition to 2D paths for extrusion it is also possible to read design
+parametes from DXF files. Besides DXF files OpenSCAD can read and create 3D
+models in the STL and OFF file formats.
diff --git a/openscad/Makefile b/openscad/Makefile
new file mode 100644
index 0000000000..570f83ff89
--- /dev/null
+++ b/openscad/Makefile
@@ -0,0 +1,49 @@
+# $NetBSD$
+#
+
+DISTNAME= openscad-master
+CATEGORIES= wip
+MASTER_SITES= -https://github.com/openscad/openscad/archive/master.zip
+EXTRACT_SUFX= .zip
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://www.openscad.org/
+COMMENT= OpenSCAD - The Programmers Solid 3D CAD Modeller
+LICENSE= gnu-gpl-v2
+
+USE_LANGUAGES= c c++11
+USE_TOOLS+= bison gettext pkg-config
+USE_LIBTOOL= yes
+
+WRKSRC= ${WRKDIR}/${DISTNAME:R}
+
+CHECK_PORTABILITY_SKIP+=tests/compare-bitmaps.sh
+
+REPLACE_PYTHON= libraries/MCAD/get_submodules.py
+.include "../../lang/python/application.mk"
+
+MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
+
+do-configure:
+ cd ${WRKSRC} && ${QTDIR}/bin/qmake \
+ PREFIX=${PREFIX} -after QMAKE_YACC=bison QMAKE_LEX=flex
+
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+# DragonFly requires FlexLexer.h from pkgsrc - base doesn't cut it.
+#.include "../../devel/flex/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../fonts/harfbuzz/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/glew/buildlink3.mk"
+.include "../../graphics/opencsg/buildlink3.mk"
+.include "../../wip/cgal/buildlink3.mk"
+.include "../../math/eigen3/buildlink3.mk"
+.include "../../math/mpfr/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt4-qscintilla/buildlink3.mk"
+.include "../../textproc/libxml++/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/openscad/PLIST b/openscad/PLIST
new file mode 100644
index 0000000000..72b8bac73e
--- /dev/null
+++ b/openscad/PLIST
@@ -0,0 +1,111 @@
+@comment $NetBSD$
+bin/openscad
+man/man1/openscad.1
+share/appdata/openscad.appdata.xml
+share/applications/openscad.desktop
+share/mime/packages/openscad.xml
+share/openscad/color-schemes/editor/dark-background.json
+share/openscad/color-schemes/editor/light-background.json
+share/openscad/color-schemes/editor/monokai.json
+share/openscad/color-schemes/editor/solarized-dark.json
+share/openscad/color-schemes/editor/solarized-light.json
+share/openscad/color-schemes/editor/tomorrow-night.json
+share/openscad/color-schemes/editor/tomorrow.json
+share/openscad/color-schemes/editor/visualstudio.json
+share/openscad/color-schemes/readme.txt
+share/openscad/color-schemes/render/beforedawn.json
+share/openscad/color-schemes/render/deepocean.json
+share/openscad/color-schemes/render/metallic.json
+share/openscad/color-schemes/render/monotone.json
+share/openscad/color-schemes/render/nature.json
+share/openscad/color-schemes/render/solarized.json
+share/openscad/color-schemes/render/starnight.json
+share/openscad/color-schemes/render/sunset.json
+share/openscad/color-schemes/render/tomorrow-night.json
+share/openscad/color-schemes/render/tomorrow.json
+share/openscad/examples/Advanced/GEB.scad
+share/openscad/examples/Advanced/animation.scad
+share/openscad/examples/Advanced/children.scad
+share/openscad/examples/Advanced/children_indexed.scad
+share/openscad/examples/Advanced/module_recursion.scad
+share/openscad/examples/Advanced/offset.scad
+share/openscad/examples/Advanced/surface_image.png
+share/openscad/examples/Advanced/surface_image.scad
+share/openscad/examples/Basics/CSG-modules.scad
+share/openscad/examples/Basics/CSG.scad
+share/openscad/examples/Basics/LetterBlock.scad
+share/openscad/examples/Basics/linear_extrude.scad
+share/openscad/examples/Basics/logo.scad
+share/openscad/examples/Basics/logo_and_text.scad
+share/openscad/examples/Basics/projection.scad
+share/openscad/examples/Basics/projection.stl
+share/openscad/examples/Basics/rotate_extrude.scad
+share/openscad/examples/Basics/text_on_cube.scad
+share/openscad/examples/COPYING-CC0.txt
+share/openscad/examples/Functions/functions.scad
+share/openscad/examples/Functions/list_comprehensions.scad
+share/openscad/examples/Functions/polygon_areas.scad
+share/openscad/examples/Functions/recursion.scad
+share/openscad/examples/Old/example001.scad
+share/openscad/examples/Old/example002.scad
+share/openscad/examples/Old/example003.scad
+share/openscad/examples/Old/example004.scad
+share/openscad/examples/Old/example005.scad
+share/openscad/examples/Old/example006.scad
+share/openscad/examples/Old/example007.dxf
+share/openscad/examples/Old/example007.scad
+share/openscad/examples/Old/example008.dxf
+share/openscad/examples/Old/example008.scad
+share/openscad/examples/Old/example009.dxf
+share/openscad/examples/Old/example009.scad
+share/openscad/examples/Old/example010.dat
+share/openscad/examples/Old/example010.scad
+share/openscad/examples/Old/example011.scad
+share/openscad/examples/Old/example012.scad
+share/openscad/examples/Old/example012.stl
+share/openscad/examples/Old/example013.dxf
+share/openscad/examples/Old/example013.scad
+share/openscad/examples/Old/example014.scad
+share/openscad/examples/Old/example015.scad
+share/openscad/examples/Old/example016.scad
+share/openscad/examples/Old/example016.stl
+share/openscad/examples/Old/example017.scad
+share/openscad/examples/Old/example018.scad
+share/openscad/examples/Old/example019.scad
+share/openscad/examples/Old/example020.scad
+share/openscad/examples/Old/example021.scad
+share/openscad/examples/Old/example022.scad
+share/openscad/examples/Old/example023.scad
+share/openscad/examples/Old/example024.scad
+share/openscad/examples/Parametric/candleStand.json
+share/openscad/examples/Parametric/candleStand.scad
+share/openscad/examples/Parametric/sign.json
+share/openscad/examples/Parametric/sign.scad
+share/openscad/examples/examples.json
+share/openscad/fonts/05-osx-fonts.conf
+share/openscad/fonts/10-liberation.conf
+share/openscad/fonts/Liberation-2.00.1/AUTHORS
+share/openscad/fonts/Liberation-2.00.1/ChangeLog
+share/openscad/fonts/Liberation-2.00.1/LICENSE
+share/openscad/fonts/Liberation-2.00.1/README
+share/openscad/fonts/Liberation-2.00.1/TODO
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-Bold.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-BoldItalic.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-Italic.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-Regular.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-Bold.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-BoldItalic.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-Italic.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-Regular.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-Bold.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-BoldItalic.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-Italic.ttf
+share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-Regular.ttf
+share/openscad/locale/cs/LC_MESSAGES/openscad.mo
+share/openscad/locale/de/LC_MESSAGES/openscad.mo
+share/openscad/locale/es/LC_MESSAGES/openscad.mo
+share/openscad/locale/fr/LC_MESSAGES/openscad.mo
+share/openscad/locale/pl/LC_MESSAGES/openscad.mo
+share/openscad/locale/ru/LC_MESSAGES/openscad.mo
+share/pixmaps/openscad.png
+@pkgdir share/openscad/libraries/MCAD
diff --git a/openscad/distinfo b/openscad/distinfo
new file mode 100644
index 0000000000..e88a21ea65
--- /dev/null
+++ b/openscad/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.6 2016/12/16 11:13:27 plunky Exp $
+
+SHA1 (openscad-master.zip) = 78a2ced47e740bcec3a0c941f8a778f7e5ab05a1
+RMD160 (openscad-master.zip) = 0c689a516629509c3e230cc159a4caa23d59fca8
+SHA512 (openscad-master.zip) = 593bb7acb1c6de1941dbb2c78122c554c0759b874be88705401c350a7437723962aaa4461c1b25a391e9c0e280b9b53dd358aaa5becb0011afcaedfed3a78d10
+Size (openscad-master.zip) = 14843991 bytes
+SHA1 (patch-openscad.pro) = 8b4250254ea66338ecafdac437ce9a69deb2fe27
+SHA1 (patch-src_ModuleCache.cc) = 039b77f4a065c700e2b3c1d0240b167f3cc5a661
+SHA1 (patch-src_StatCache.cc) = f502ac3b1b10b548f5174197a1dbf5af37b9c6c3
+SHA1 (patch-src_colormap.h) = cc48b16629ec8106d1b2c9686f90251e3d5d093d
+SHA1 (patch-src_scintillaeditor.h) = a94e87fa6eb410b77ade37b42b39971de7400229
diff --git a/openscad/patches/patch-openscad.pro b/openscad/patches/patch-openscad.pro
new file mode 100644
index 0000000000..4a0359e04e
--- /dev/null
+++ b/openscad/patches/patch-openscad.pro
@@ -0,0 +1,14 @@
+$NetBSD: patch-openscad.pro,v 1.2 2016/09/01 19:53:36 plunky Exp $
+
+install manpage to correct location
+
+--- openscad.pro.orig 2015-11-16 05:13:56.000000000 +0000
++++ openscad.pro
+@@ -585,6 +585,6 @@ icons.path = $$PREFIX/share/pixmaps
+ icons.extra = test -f icons/$${FULLNAME}.png && cp -f icons/$${FULLNAME}.png \"\$(INSTALL_ROOT)$${icons.path}/\" || cp -f icons/openscad.png \"\$(INSTALL_ROOT)$${icons.path}/$${FULLNAME}.png\"
+ INSTALLS += icons
+
+-man.path = $$PREFIX/share/man/man1
++man.path = $$PREFIX/man/man1
+ man.extra = cp -f doc/openscad.1 \"\$(INSTALL_ROOT)$${man.path}/$${FULLNAME}.1\"
+ INSTALLS += man
diff --git a/openscad/patches/patch-src_ModuleCache.cc b/openscad/patches/patch-src_ModuleCache.cc
new file mode 100644
index 0000000000..ad5a975df4
--- /dev/null
+++ b/openscad/patches/patch-src_ModuleCache.cc
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/ModuleCache.cc.orig 2018-03-13 12:12:43.000000000 +0000
++++ src/ModuleCache.cc
+@@ -10,6 +10,7 @@
+ #include <fstream>
+ #include <sstream>
+ #include <time.h>
++#include <sys/timeb.h>
+ #include <sys/stat.h>
+ #include <algorithm>
+
diff --git a/openscad/patches/patch-src_StatCache.cc b/openscad/patches/patch-src_StatCache.cc
new file mode 100644
index 0000000000..859149b907
--- /dev/null
+++ b/openscad/patches/patch-src_StatCache.cc
@@ -0,0 +1,27 @@
+$NetBSD$
+
+--- src/StatCache.cc.orig 2018-03-13 12:12:43.000000000 +0000
++++ src/StatCache.cc
+@@ -27,7 +27,8 @@
+ #include "StatCache.h"
+ #include "printutils.h"
+
+-#include <sys/timeb.h>
++#include <sys/types.h>
++#include <sys/time.h>
+ #include <string>
+ #include <unordered_map>
+
+@@ -37,9 +38,9 @@ const float stale = 0.190; // Maximum l
+
+ double millis_clock(void)
+ {
+- struct timeb tb;
+- ftime(&tb);
+- return tb.time + double(tb.millitm) / 1000;
++ struct timeval tv;
++ gettimeofday(&tv, NULL);
++ return (unsigned long)tv.tv_sec*1000UL+(unsigned long)tv.tv_usec/1000;
+ }
+
+ struct CacheEntry
diff --git a/openscad/patches/patch-src_colormap.h b/openscad/patches/patch-src_colormap.h
new file mode 100644
index 0000000000..e091301ce8
--- /dev/null
+++ b/openscad/patches/patch-src_colormap.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- src/colormap.h.orig 2018-03-13 12:12:43.000000000 +0000
++++ src/colormap.h
+@@ -6,9 +6,10 @@
+ #include "linalg.h"
+
+ #include "memory.h"
++#ifndef Q_MOC_RUN
+ #include <boost/filesystem.hpp>
+ #include <boost/property_tree/ptree.hpp>
+-
++#endif
+ namespace fs = boost::filesystem;
+
+ enum class RenderColor {
diff --git a/openscad/patches/patch-src_scintillaeditor.h b/openscad/patches/patch-src_scintillaeditor.h
new file mode 100644
index 0000000000..51158ae795
--- /dev/null
+++ b/openscad/patches/patch-src_scintillaeditor.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/scintillaeditor.h.orig 2018-03-13 12:12:43.000000000 +0000
++++ src/scintillaeditor.h
+@@ -12,8 +12,10 @@
+ #include "parsersettings.h"
+
+ #include "memory.h"
++#ifndef Q_MOC_RUN
+ #include <boost/property_tree/ptree.hpp>
+ #include <boost/property_tree/json_parser.hpp>
++#endif
+
+ class EditorColorScheme
+ {
Home |
Main Index |
Thread Index |
Old Index