zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

antimony: remove

Browse Source 
* Never got it to run
* from history and last commit it seems development has stopped [1]

[1] d875666b02

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2019-12-05 14:23:34 +01:00
parent f8769e5c91
commit fab8a64252
8 changed files with 0 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
recipes-misc/recipes-cad/antimony/antimony_0.9.0c.bb
View File

@@ -1,26 +0,0 @@
SUMMARY = "Antimony is a computer-aided design (CAD) tool from a parallel universe"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://README.md;beginline=23;endline=48;md5=9b0a0f10af772bdc7ab3e80c53fc287d"
inherit qmake5 python3native
DEPENDS = "qtbase python3 boost lemon-native"
SRC_URI = " \
https://github.com/mkeeter/${BPN}/archive/${PV}.tar.gz \
file://0001-remove-paths-from-python3-config.patch \
file://0002-hardcode-boost_python3-library-detection-wont-t-work.patch \
file://0003-align-binary-installation-folders.patch \
file://0004-do-not-hard-link-to-python-version-we-don-t-have.patch \
file://0005-v2syntax-add-missing-include.patch \
file://0006-Change-isinf-to-std-isinf.patch \
"
SRC_URI[md5sum] = "2df03f0a8b6d7db21c24dcf20142297e"
SRC_URI[sha256sum] = "78f22836ede812fa5bb283779ea6ada8568caf76fa4ab0473ee00d2d544b0aa4"
CXXFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR}m"
do_configure_append() {
# binary is in build dir
sed -i 's:${S}/qt/antimony:${B}/antimony:g' ${B}/Makefile
}

33
recipes-misc/recipes-cad/antimony/files/0001-remove-paths-from-python3-config.patch
View File

@@ -1,33 +0,0 @@
From a5cb20ec541a8e828859a25720f068bf32e6480d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sat, 5 Mar 2016 22:20:41 +0100
Subject: [PATCH 1/3] remove paths from python3-config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
qt/python.pri | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/qt/python.pri b/qt/python.pri
index 2504c01..550383c 100644
--- a/qt/python.pri
+++ b/qt/python.pri
@@ -14,8 +14,8 @@ macx {
}
linux {
- QMAKE_CXXFLAGS += $$system(/usr/bin/python3-config --includes)
- QMAKE_LFLAGS += $$system(/usr/bin/python3-config --ldflags)
+ QMAKE_CXXFLAGS += $$system(python3-config --includes)
+ QMAKE_LFLAGS += $$system(python3-config --ldflags)
# Even though this is in QMAKE_LFLAGS, the linker is picky about
# library ordering (so it needs to be here too).
--
2.5.0

39
recipes-misc/recipes-cad/antimony/files/0002-hardcode-boost_python3-library-detection-wont-t-work.patch
View File

@@ -1,39 +0,0 @@
From e3b4a08c4e8b4e59d8f2fb79df8fab7883ce9b35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sat, 5 Mar 2016 22:24:15 +0100
Subject: [PATCH 2/3] hardcode boost_python3 library - detection wont't work
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
qt/python.pri | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/qt/python.pri b/qt/python.pri
index 550383c..d51935a 100644
--- a/qt/python.pri
+++ b/qt/python.pri
@@ -38,14 +38,8 @@ linux {
error("Could not find ldconfig!")
}
- # Check for different boost::python naming schemes
- LDCONFIG_OUT = $$system($$LDCONFIG_BIN -p|grep python)
- for (b, $$list(boost_python-py34 boost_python3)) {
- contains(LDCONFIG_OUT, "lib$${b}.so") {
- LIBS += "-l$$b"
- GOT_BOOST_PYTHON = True
- }
- }
+ LIBS += "-lboost_python3"
+ GOT_BOOST_PYTHON = True
# If we couldn't find boost::python, exit with an error.
isEmpty(GOT_BOOST_PYTHON) {
--
2.5.0

37
recipes-misc/recipes-cad/antimony/files/0003-align-binary-installation-folders.patch
View File

@@ -1,37 +0,0 @@
From 09db90cefb2d466e143ee655e3a10220d86fb88b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sat, 5 Mar 2016 22:28:58 +0100
Subject: [PATCH 3/3] align binary installation folders
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
app/app.pro | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/app.pro b/app/app.pro
index 5559ab2..e425c55 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -39,11 +39,11 @@ linux {
# Rename file from "Antimony" to "antimony"
QMAKE_POST_LINK += $(MOVE) $$OUT_PWD/$${TARGET} $$OUT_PWD/$$lower($${TARGET})
- executable.path = /usr/local/bin
+ executable.path = /usr/bin
executable.files = antimony
- nodes_folder.path = /usr/local/bin/sb/nodes
+ nodes_folder.path = /usr/bin/sb/nodes
nodes_folder.files = ../py/nodes/*
- fab_folder.path = /usr/local/bin/sb/fab
+ fab_folder.path = /usr/bin/sb/fab
fab_folder.files = ../py/fab/*
INSTALLS += executable nodes_folder fab_folder
}
--
2.5.0

31
recipes-misc/recipes-cad/antimony/files/0004-do-not-hard-link-to-python-version-we-don-t-have.patch
View File

@@ -1,31 +0,0 @@
From f2e5c5cf4db97d328dc171d42360b8bb09125f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 6 Mar 2016 22:40:18 +0100
Subject: [PATCH] do not hard link to python version we don't have
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
qt/python.pri | 4 ----
1 file changed, 4 deletions(-)
diff --git a/qt/python.pri b/qt/python.pri
index d51935a..f28bb25 100644
--- a/qt/python.pri
+++ b/qt/python.pri
@@ -19,7 +19,7 @@ linux {
# Even though this is in QMAKE_LFLAGS, the linker is picky about
# library ordering (so it needs to be here too).
- LIBS += -lpython3.4m
+ LIBS += -lpython3.5m
# ldconfig is being used to find libboost_python, but it's in a different
# place in different distros (and is not in the default $PATH on Debian).
--
2.5.0

45
recipes-misc/recipes-cad/antimony/files/0005-v2syntax-add-missing-include.patch
View File

@@ -1,45 +0,0 @@
From 275eee8b5efbd765f71918068758cbcf724fb9c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 7 Mar 2016 09:51:42 +0100
Subject: [PATCH] v2syntax: add missing include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
| ../../../antimony-0.9.0c/lib/fab/src/tree/v2syntax.c:1130:46: error: 'memset' was not declared in this scope
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
lib/fab/src/tree/v2syntax.l | 1 +
lib/fab/src/tree/v2syntax.y | 1 +
2 files changed, 2 insertions(+)
diff --git a/lib/fab/src/tree/v2syntax.l b/lib/fab/src/tree/v2syntax.l
index c8e69be..0fbe7bb 100644
--- a/lib/fab/src/tree/v2syntax.l
+++ b/lib/fab/src/tree/v2syntax.l
@@ -2,6 +2,7 @@
%{
#include <math.h>
#include <stdlib.h>
+ #include <string.h>
#include "fab/tree/v2parser.hpp"
#include "v2syntax.lemon.hpp"
%}
diff --git a/lib/fab/src/tree/v2syntax.y b/lib/fab/src/tree/v2syntax.y
index 2e698a9..30c8f16 100644
--- a/lib/fab/src/tree/v2syntax.y
+++ b/lib/fab/src/tree/v2syntax.y
@@ -2,6 +2,7 @@
#include <math.h>
#include <cassert>
#include <iostream>
+ #include <string.h>
#include "fab/tree/v2parser.hpp"
extern "C"
--
2.5.0

114
recipes-misc/recipes-cad/antimony/files/0006-Change-isinf-to-std-isinf.patch
View File

@@ -1,114 +0,0 @@
From ec04dbca58d11f43304d32544d33b0276e3188c9 Mon Sep 17 00:00:00 2001
From: Stefano Probst <senden9@gmail.com>
Date: Thu, 3 Mar 2016 20:16:22 +0100
Subject: [PATCH] Change "isinf" to "std::isinf"
Upstream-Status: Submitted [1]
[1] https://github.com/mkeeter/antimony/pull/151
---
app/src/export/export_heightmap.cpp | 2 +-
app/src/graph/hooks/export.cpp | 10 +++++-----
app/src/render/render_task.cpp | 6 +++---
app/src/ui/dialogs/resolution_dialog.cpp | 2 +-
lib/fab/src/types/bounds.cpp | 8 ++++----
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/app/src/export/export_heightmap.cpp b/app/src/export/export_heightmap.cpp
index f7e1c7c..13dca08 100644
--- a/app/src/export/export_heightmap.cpp
+++ b/app/src/export/export_heightmap.cpp
@@ -103,7 +103,7 @@ void ExportHeightmapTask::render()
.nk=1
};
- if (!isinf(bounds.zmin) && !isinf(bounds.zmax))
+ if (!std::isinf(bounds.zmin) && !std::isinf(bounds.zmax))
r.nk = uint32_t((bounds.zmax - bounds.zmin) * resolution);
build_arrays(
diff --git a/app/src/graph/hooks/export.cpp b/app/src/graph/hooks/export.cpp
index f09a3a5..3d4e76e 100644
--- a/app/src/graph/hooks/export.cpp
+++ b/app/src/graph/hooks/export.cpp
@@ -92,9 +92,9 @@ object ScriptExportHooks::stl(tuple args, dict kwargs)
bounds = get_bounds(kwargs);
// Sanity-check bounds
- if (isinf(bounds.xmin) || isinf(bounds.xmax) ||
- isinf(bounds.ymin) || isinf(bounds.ymax) ||
- isinf(bounds.zmin) || isinf(bounds.zmax))
+ if (std::isinf(bounds.xmin) || std::isinf(bounds.xmax) ||
+ std::isinf(bounds.ymin) || std::isinf(bounds.ymax) ||
+ std::isinf(bounds.zmin) || std::isinf(bounds.zmax))
{
throw AppHooks::Exception(
"Exporting mesh with invalid (infinite) bounds");
@@ -143,8 +143,8 @@ object ScriptExportHooks::heightmap(tuple args, dict kwargs)
bounds = get_bounds(kwargs);
// Sanity-check bounds
- if (isinf(bounds.xmin) || isinf(bounds.xmax) ||
- isinf(bounds.ymin) || isinf(bounds.ymax))
+ if (std::isinf(bounds.xmin) || std::isinf(bounds.xmax) ||
+ std::isinf(bounds.ymin) || std::isinf(bounds.ymax))
{
throw AppHooks::Exception(
"Exporting heightmap with invalid (infinite) bounds");
diff --git a/app/src/render/render_task.cpp b/app/src/render/render_task.cpp
index 299758d..d6f80a0 100644
--- a/app/src/render/render_task.cpp
+++ b/app/src/render/render_task.cpp
@@ -64,10 +64,10 @@ void RenderTask::render()
Q_ASSERT(get_shape.check());
Shape s = get_shape();
- if (!isinf(s.bounds.xmin) && !isinf(s.bounds.xmax) &&
- !isinf(s.bounds.xmin) && !isinf(s.bounds.xmax))
+ if (!std::isinf(s.bounds.xmin) && !std::isinf(s.bounds.xmax) &&
+ !std::isinf(s.bounds.xmin) && !std::isinf(s.bounds.xmax))
{
- if (isinf(s.bounds.zmin) || isinf(s.bounds.zmax))
+ if (std::isinf(s.bounds.zmin) || std::isinf(s.bounds.zmax))
render2d(s);
else
render3d(s);
diff --git a/app/src/ui/dialogs/resolution_dialog.cpp b/app/src/ui/dialogs/resolution_dialog.cpp
index 50e0970..9a91894 100644
--- a/app/src/ui/dialogs/resolution_dialog.cpp
+++ b/app/src/ui/dialogs/resolution_dialog.cpp
@@ -7,7 +7,7 @@
ResolutionDialog::ResolutionDialog(Bounds bounds, bool dimensions, bool has_units,
long max_voxels, QWidget* parent)
: QDialog(parent), bounds(bounds), ui(new Ui::ResolutionDialog),
- z_bounded(!isinf(bounds.zmax) && !isinf(bounds.zmin))
+ z_bounded(!std::isinf(bounds.zmax) && !std::isinf(bounds.zmin))
{
ui->setupUi(this);
diff --git a/lib/fab/src/types/bounds.cpp b/lib/fab/src/types/bounds.cpp
index e19541c..bf36443 100644
--- a/lib/fab/src/types/bounds.cpp
+++ b/lib/fab/src/types/bounds.cpp
@@ -81,13 +81,13 @@ Bounds Bounds::map(Transform t) const
bool Bounds::is_bounded_xy() const
{
- return !isinf(xmin) && !isinf(ymin) &&
- !isinf(xmax) && !isinf(ymax);
+ return !std::isinf(xmin) && !std::isinf(ymin) &&
+ !std::isinf(xmax) && !std::isinf(ymax);
}
bool Bounds::is_bounded_xyz() const
{
- return !isinf(xmin) && !isinf(ymin) && !isinf(zmin) &&
- !isinf(xmax) && !isinf(ymax) && !isinf(zmax);
+ return !std::isinf(xmin) && !std::isinf(ymin) && !std::isinf(zmin) &&
+ !std::isinf(xmax) && !std::isinf(ymax) && !std::isinf(zmax);
}
--
2.5.0

2
recipes-support/packagegroups/meta-qt5-extra-world.bb
View File

@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
inherit packagegroup
RDEPENDS_${PN} = " \
antimony \
\
gottcode-world \
\
compton \