From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- sci-misc/repsnapper/Manifest | 12 +++++ .../repsnapper/files/repsnapper-2.4a_p0-gcc6.patch | 54 ++++++++++++++++++++++ sci-misc/repsnapper/files/std-c11.patch | 31 +++++++++++++ sci-misc/repsnapper/metadata.xml | 10 ++++ sci-misc/repsnapper/repsnapper-2.3.2a_p3.ebuild | 33 +++++++++++++ sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild | 36 +++++++++++++++ sci-misc/repsnapper/repsnapper-2.4a_p3.ebuild | 34 ++++++++++++++ sci-misc/repsnapper/repsnapper-9999.ebuild | 29 ++++++++++++ 8 files changed, 239 insertions(+) create mode 100644 sci-misc/repsnapper/Manifest create mode 100644 sci-misc/repsnapper/files/repsnapper-2.4a_p0-gcc6.patch create mode 100644 sci-misc/repsnapper/files/std-c11.patch create mode 100644 sci-misc/repsnapper/metadata.xml create mode 100644 sci-misc/repsnapper/repsnapper-2.3.2a_p3.ebuild create mode 100644 sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild create mode 100644 sci-misc/repsnapper/repsnapper-2.4a_p3.ebuild create mode 100644 sci-misc/repsnapper/repsnapper-9999.ebuild (limited to 'sci-misc/repsnapper') diff --git a/sci-misc/repsnapper/Manifest b/sci-misc/repsnapper/Manifest new file mode 100644 index 000000000000..2b30a85bd159 --- /dev/null +++ b/sci-misc/repsnapper/Manifest @@ -0,0 +1,12 @@ +AUX repsnapper-2.4a_p0-gcc6.patch 2557 SHA256 0c9f7ac74d720d1c83e32839e385b89f44198cb4e6b1e39bb0c360b3f68d1e11 SHA512 21e4d62f7fc11989c27ed8909ad64ee19e51724deba18ca6d4fc6762bdbe774493857538468629c962fe12a6d667274258e905967b636222a0b18b0c37bb866d WHIRLPOOL d242a89b02680e5b90c709b5fa2a550048924d216b52acb12ed5565585ebd461776a95e85c9fea57184295f138a544b840c41f135ec2a44a48ecf18ed5d590d1 +AUX std-c11.patch 1153 SHA256 5f6ac2a52dbd04829b4416a81f9e0a9bd9d6742c4edd02d0e5b1128368fbb7ea SHA512 348850d7f1d7c1f183fd041e5411cb94c0b495e0dd0478945015d72b059bfc3c56087332ca0e86d4779558ca430f6d645053e2aba23fc92ad6b6825bf14552cd WHIRLPOOL 7b848b6427f14aa9dce8f2907076fbe5d3e583994d10fc7050641f7074011940f43d84521cb83157172a9ad6a6197ac68ca55c08a9f2f7b80e9fdb65fe2bdb3b +DIST repsnapper-2.3.2a3.tar.gz 1344447 SHA256 7c4bc3603401847ce1f15298435c511f76fd74c5d5ae4fc1561c7f378c182fe5 SHA512 f68510baefb898954f58aa5e35909b8215edcd8ee74028e717ad97293091f4b323628ca0ba80ff685d1aef0db4785a2887986b89a95769a70f8f23ab031dafa4 WHIRLPOOL 0693876194c5837091b9f9df7d359833b86222345239f3cf946a0e6efd2f87efc35380745cb2a4dd5587a5193c9a3e54d36454fabb0d38722a02ac70d510645d +DIST repsnapper-2.4a0.tar.gz 888457 SHA256 06d993b6eafc31b246181f64ef404de6948362d7096407ff06576e2ed416f7da SHA512 b79c51f53ae29d09f5a328366c10b9e775d396f6da0ef24aa71b522fbd718af2f658700838f64ba01ce9c5cab90e39960b0ca5ed2554f802ff37ef258ae89031 WHIRLPOOL 303b34674b4d761069ad4ab935462ef0b7c16e886a8b97039ebd2a3b532664feea00192b23b79bd39cce75b042fed971626e52695c147d088aa3bbe11d69e0e1 +DIST repsnapper-2.4a3.tar.gz 888546 SHA256 f9fd847e28ae481df26d49e9017ebbadbf6395c8d20b846577a5284d1c4d4ff0 SHA512 ebe586a9212edbf699444a9c89b25702facd1018751658b831e9e662cd1bc2c54e6827802c0d89055c2882cef7db343bf036c08a9a1fc28bc66acee895bca6aa WHIRLPOOL 3095265bcebf3c76b1bce8d2faf09402a2d1fa9dde758662a648ccf2867c5aede36a4c457add747923d58cec2368962c0380f263482e50548e3b15b1e270bb9f +EBUILD repsnapper-2.3.2a_p3.ebuild 712 SHA256 30b489ee327ce96b18c317ed978865b342cf9ec3d26aa98d7998b987d2a8d573 SHA512 ccc46b6e36674fef31cc3b41e5eaa7468df551771aec8e8271aa7ce651027af945931366e7da9748b771e51e7c51a5c3cf181afd26bd5de857f1ac602aa9bac8 WHIRLPOOL f9ba5d1550bc2760c5e988dfe3cc7e4517d992c343044f218ce2e918c33b455af39380178a2201d8bb6d289a55fd6f4fb711d308be8f3b856f11be688744b389 +EBUILD repsnapper-2.4a_p0.ebuild 831 SHA256 32415735ae8afc1769fea684d41c7ab57b4272790909a34e9b1d68b410b30401 SHA512 52016084f21c27d7429e3e27c33b6105920e2f4c0a95849795749ec9a03a536ad4b38e884196878af7204a8a59758a191db0ab28b89c9067ec8caaa71d2da105 WHIRLPOOL b3420e540c3e1329b3f4d846ef9aef42000560a609f0c66fbe849f5307380baf4d26f6f341160a50d5ddc9924b43a4518f99c2ede79ca6ddbb2beb43ae137586 +EBUILD repsnapper-2.4a_p3.ebuild 759 SHA256 aa04c7a24bd558dac4a7392017e5313a676529907a4830f3c6df4f8fbbb7a3f1 SHA512 857bcd737eaebcd6a8669095b01b5e187721fc970ef8842563bc26a2e41cf40902c038853f39865f19adadb69ea762ac73249196c098dd8130fa69c534dba2d1 WHIRLPOOL 09390ebfc1da85cb991c37d341a91ddaa516486fb7215f8993ebe0fa7f839fa28f0b0b1b165054b783d86f04cb7505b65adf79bcc980c57e54b42976b5ac499b +EBUILD repsnapper-9999.ebuild 563 SHA256 dae98c524e610fdb3d37b254f019c4a01f1f1aaf7d0fc2e93f8871eaded72810 SHA512 8825c4dd593cba85aefa11f60faeac6a5654a98d312d76527b57f928d45d88e34b6a45523bb5d081418b6baf7f281f17e9b7952a66c7bb4c3d2565d195dc127b WHIRLPOOL c444bd047181aeb5ab75371e3382d574d00d165d8899db4052d5e7727523a608cf86cad1d084e26121bd93ed14bc64944e648713d1294a0d25e19ede3435742d +MISC ChangeLog 3700 SHA256 31fc6a42f702245e1d2702c487616c6ebc97a89e44f17f3a521bcab712bba691 SHA512 52f59c61d773d0c884f1a882e832bb7e8d80caff07c5339a447dc5dfba0045c8b6c5d3a10a09ee743e95a36f1542724c1064a948e953b2ab4fb51bb7c7d8ebe9 WHIRLPOOL b5811b4c41aa5f955bd1db13cdb791d0ce4ffcb3e6865e3fc61df1c99dd58af1a3b900128d36d2abf7a5c954bf5feca60a643791cc077b4ff49c06df22d48e08 +MISC ChangeLog-2015 1647 SHA256 9a7f54309370751155d0a619e23727717ee90560bcc6776b73e8de93fb06f515 SHA512 6ca0385db6b8d267367fff0457b19fe7dc4d0d96fbd456378d3798d89b85eb0f3c2981d2851a5cac0400616370f3cd1b440b8b176a51958fcd0147a1ac299ef2 WHIRLPOOL 5b2f62162ce5f9dd2d17424dc34dff1fd1ca758c4955b4c38b374e9c490c25c1a2fbf72208afd63a517caec9e9b6fdf02202a79c0f35bfbb4614e43ca5c3c018 +MISC metadata.xml 301 SHA256 9ab1758413e5e9cc594a7612b8611a8c61863cc629363237c11b4e4b50756119 SHA512 51167da8839099636779df896adb9386221d5af9da3c8b32b6f1b7236e34cf21cb5a3db7388f218284ec28a0b4dd66da927a860396afa9cd3087e3fe4cd91f9d WHIRLPOOL b431731fdf4d4f12aae4fb8f53009f5ab9162204f693ec3e0fb15665fb15f758bffeac202bf25d13c5f2024e1b92adddfa20c6861b3e54916f06af1abf32c385 diff --git a/sci-misc/repsnapper/files/repsnapper-2.4a_p0-gcc6.patch b/sci-misc/repsnapper/files/repsnapper-2.4a_p0-gcc6.patch new file mode 100644 index 000000000000..80a3c56eb86b --- /dev/null +++ b/sci-misc/repsnapper/files/repsnapper-2.4a_p0-gcc6.patch @@ -0,0 +1,54 @@ +From f6a411fa829f144800d123c1256d7d7648736437 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tiago=20St=C3=BCrmer=20Daitx?= +Date: Thu, 1 Sep 2016 00:02:48 -0300 +Subject: [PATCH 1/2] replace abs() with std::abs() for gcc6 compatibility +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Building with GCC 6 fails with "call of overloaded ‘abs(double)’ is +ambiguous" - for some reason only on PowerPC and PPC64. +--- + libraries/amf/amftools-code/include/STL_File.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libraries/amf/amftools-code/include/STL_File.h b/libraries/amf/amftools-code/include/STL_File.h +index 0bc01bed..2d9d656f 100644 +--- a/libraries/amf/amftools-code/include/STL_File.h ++++ b/libraries/amf/amftools-code/include/STL_File.h +@@ -89,7 +89,7 @@ class aWeldVertex { + Vec3D v; + int OrigIndex; + +- static inline bool IsSoftLessThan(const aWeldVertex& v1, const aWeldVertex& v2){if(abs(v1.v.z - v2.v.z) <= WeldThresh){ if(abs(v1.v.y - v2.v.y) <= WeldThresh){ return v1.v.x < v2.v.x-WeldThresh;}else return (v1.v.y < v2.v.y-WeldThresh);} else return (v1.v.z < v2.v.z-WeldThresh); } //Is less then (generates a "hash" for sorting vertices by z for set ++ static inline bool IsSoftLessThan(const aWeldVertex& v1, const aWeldVertex& v2){if(std::abs(v1.v.z - v2.v.z) <= WeldThresh){ if(std::abs(v1.v.y - v2.v.y) <= WeldThresh){ return v1.v.x < v2.v.x-WeldThresh;}else return (v1.v.y < v2.v.y-WeldThresh);} else return (v1.v.z < v2.v.z-WeldThresh); } //Is less then (generates a "hash" for sorting vertices by z for set + static double WeldThresh; //weld threshold for importing from STL + }; + + +From 93c81e3794a3eb7c2b7c7611803a3107fb25027b Mon Sep 17 00:00:00 2001 +From: "Ying-Chun Liu (PaulLiu)" +Date: Wed, 4 Jan 2017 13:50:56 +0800 +Subject: [PATCH 2/2] Fix FTBFS for glibmm Glib::RefPtr + +Now we can use operator RefPtr::operator bool() to test if it is NULL. +RefPtr::operator== can not work on int. + +Signed-off-by: Ying-Chun Liu (PaulLiu) +--- + src/model.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/model.cpp b/src/model.cpp +index ee559c47..22f0bb39 100644 +--- a/src/model.cpp ++++ b/src/model.cpp +@@ -181,7 +181,7 @@ vector Model::ReadShapes(Glib::RefPtr file, + uint max_triangles) + { + vector shapes; +- if (file==0) return shapes; ++ if (!file) return shapes; + File sfile(file); + vector< vector > triangles; + vector shapenames; diff --git a/sci-misc/repsnapper/files/std-c11.patch b/sci-misc/repsnapper/files/std-c11.patch new file mode 100644 index 000000000000..a8ff67ae3878 --- /dev/null +++ b/sci-misc/repsnapper/files/std-c11.patch @@ -0,0 +1,31 @@ +--- src/slicer/poly.cpp.orig 2015-12-28 07:54:32.774722105 +0100 ++++ src/slicer/poly.cpp 2015-12-28 07:54:41.188055896 +0100 +@@ -225,7 +225,7 @@ + // Start with first vertex as closest + uint nindex = 0; + mindist = (vertices[0]-p).squared_length(); +- if (isnan(mindist)) { // for infinity point p return point 0 and distance 0 ++ if (std::isnan(mindist)) { // for infinity point p return point 0 and distance 0 + mindist = 0.; + return 0; + } +--- src/slicer/printlines.cpp.orig 2015-12-28 07:54:05.814720635 +0100 ++++ src/slicer/printlines.cpp 2015-12-28 07:54:19.821388065 +0100 +@@ -240,7 +240,7 @@ + if (abs(absolute_extrusion) < 0.00001) + travel_speed = max(minspeed, speed); // in case speed is too low + +- if (!isnan(absolute_extrusion)) ++ if (!std::isnan(absolute_extrusion)) + // allowed to push/pull at arbitrary speed + extrudedMaterial += absolute_extrusion; + else +@@ -335,7 +335,7 @@ + else + factor = 1./newlines.size(); + newlines[i].absolute_extrusion *= factor; +- assert(!isnan(newlines[i].absolute_extrusion)); ++ assert(!std::isnan(newlines[i].absolute_extrusion)); + + } + return newlines; diff --git a/sci-misc/repsnapper/metadata.xml b/sci-misc/repsnapper/metadata.xml new file mode 100644 index 000000000000..7c089992c088 --- /dev/null +++ b/sci-misc/repsnapper/metadata.xml @@ -0,0 +1,10 @@ + + + + + slis@gentoo.org + + + timschmidt/repsnapper + + diff --git a/sci-misc/repsnapper/repsnapper-2.3.2a_p3.ebuild b/sci-misc/repsnapper/repsnapper-2.3.2a_p3.ebuild new file mode 100644 index 000000000000..4f043bd5b3b7 --- /dev/null +++ b/sci-misc/repsnapper/repsnapper-2.3.2a_p3.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit autotools versionator + +MY_PV="$(get_version_component_range 1-4)$(get_version_component_range 5)" +MY_PV=${MY_PV/p/} + +DESCRIPTION="Host software for controlling the RepRap open source 3D printer" +HOMEPAGE="https://github.com/timschmidt/repsnapper" +SRC_URI="https://github.com/timschmidt/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz" + +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + >=dev-cpp/gtkglextmm-1.2 + dev-cpp/gtkmm:2.4 + dev-cpp/libxmlpp + dev-libs/libzip + virtual/opengl +" +RDEPEND=${DEPEND} + +src_prepare() { + eautoreconf +} diff --git a/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild b/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild new file mode 100644 index 000000000000..26bbc8eb54b9 --- /dev/null +++ b/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit autotools flag-o-matic versionator + +MY_PV="$(get_version_component_range 1-3)$(get_version_component_range 4)" +MY_PV=${MY_PV/p/} + +DESCRIPTION="Host software for controlling the RepRap open source 3D printer" +HOMEPAGE="https://github.com/timschmidt/repsnapper" +SRC_URI="https://github.com/timschmidt/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz" + +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + >=dev-cpp/gtkglextmm-1.2 + dev-cpp/gtkmm:2.4 + dev-cpp/libxmlpp:2.6 + dev-libs/libzip + virtual/opengl +" +RDEPEND=${DEPEND} + +src_prepare() { + epatch "${FILESDIR}/std-c11.patch" + epatch "${FILESDIR}/${P}-gcc6.patch" + eautoreconf + append-cxxflags -std=c++11 +} diff --git a/sci-misc/repsnapper/repsnapper-2.4a_p3.ebuild b/sci-misc/repsnapper/repsnapper-2.4a_p3.ebuild new file mode 100644 index 000000000000..860571030c58 --- /dev/null +++ b/sci-misc/repsnapper/repsnapper-2.4a_p3.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit autotools flag-o-matic versionator + +MY_PV="$(get_version_component_range 1-3)$(get_version_component_range 4)" +MY_PV=${MY_PV/p/} + +DESCRIPTION="Host software for controlling the RepRap open source 3D printer" +HOMEPAGE="https://github.com/timschmidt/repsnapper" +SRC_URI="https://github.com/timschmidt/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz" + +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + >=dev-cpp/gtkglextmm-1.2 + dev-cpp/gtkmm:2.4 + dev-cpp/libxmlpp:2.6 + dev-libs/libzip + virtual/opengl +" +RDEPEND="${DEPEND}" + +src_prepare() { + eautoreconf + append-cxxflags -std=c++11 +} diff --git a/sci-misc/repsnapper/repsnapper-9999.ebuild b/sci-misc/repsnapper/repsnapper-9999.ebuild new file mode 100644 index 000000000000..94bff9cff952 --- /dev/null +++ b/sci-misc/repsnapper/repsnapper-9999.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit autotools git-2 + +DESCRIPTION="Host software for controlling the RepRap open source 3D printer" +HOMEPAGE="https://github.com/timschmidt/repsnapper" +EGIT_REPO_URI="https://github.com/timschmidt/${PN}.git" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="" + +DEPEND=" + >=dev-cpp/gtkglextmm-1.2 + dev-cpp/gtkmm:2.4 + dev-cpp/libxmlpp:2.6 + dev-libs/libzip + virtual/opengl +" +RDEPEND=${DEPEND} + +src_prepare() { + eautoreconf + append-cxxflags -std=c++11 +} -- cgit v1.2.3