From 7d07455d5a5b12428a5778d1316bd62b0f9940c9 Mon Sep 17 00:00:00 2001
From: Tim Orling <TicoTimo@gmail.com>
Date: Fri, 11 Jul 2014 19:51:27 -0700
Subject: slic3r: update to git master

* v1.1.6 was broken for perl 5.20.0
  - fixed with commit 67bf99633e48f9c8a5863b88c2a03fddc1cc247f
* Create a separate recipe for libslic3r-xs-perl
* Fixes for install locations for Slic3r/XS.pm, auto/Slic3r/XS/XS.*

NOTE: perl Build.PL is not generating a Build script...

TODO: add gui requires and recommends
      Hardcode install of slic3r.pl to ${bindir}?

Signed-off-by: Tim Orling <TicoTimo@gmail.com>
---
 .../slic3r/libslic3r-xs-perl_git.bb                | 92 ++++++++++++++++++++++
 meta-maker/recipes-printing/slic3r/slic3r_1.1.6.bb | 49 ------------
 meta-maker/recipes-printing/slic3r/slic3r_git.bb   | 67 ++++++++++++++++
 3 files changed, 159 insertions(+), 49 deletions(-)
 create mode 100644 meta-maker/recipes-printing/slic3r/libslic3r-xs-perl_git.bb
 delete mode 100644 meta-maker/recipes-printing/slic3r/slic3r_1.1.6.bb
 create mode 100644 meta-maker/recipes-printing/slic3r/slic3r_git.bb

diff --git a/meta-maker/recipes-printing/slic3r/libslic3r-xs-perl_git.bb b/meta-maker/recipes-printing/slic3r/libslic3r-xs-perl_git.bb
new file mode 100644
index 0000000000..e155bdeb90
--- /dev/null
+++ b/meta-maker/recipes-printing/slic3r/libslic3r-xs-perl_git.bb
@@ -0,0 +1,92 @@
+SUMMARY = "Slic3r - G-code generator for 3D printers"
+DESCRIPTION = "Slic3r takes 3D models (STL, OBJ, AMF) and converts them into \
+G-code instructions for 3D printers. It's compatible with any modern printer \
+based on the RepRap toolchain, including all those based on the Marlin, \
+Sprinter and Repetier firmware. It also works with Mach3 and LinuxCNC \
+controllers. \
+"
+HOMEPAGE = "http://slic3r.org/"
+SECTION = "devel"
+
+LICENSE = "AGPL-3.0 | CC-BY-3.0"
+LIC_FILES_CHKSUM = "file://../README.md;beginline=77;endline=84;md5=4e907cb01787f6711506359a57c22961"
+
+export SLIC3R_NO_AUTO = "1"
+export EXTRA_CPAN_BUILD_FLAGS = " --xs"
+
+DEPENDS = "  libcapture-tiny-perl-native \
+             libencode-locale-perl-native \
+	     libextutils-cppguess-perl-native \
+             libextutils-parsexs-perl-native \
+	     libextutils-typemaps-default-perl-native \
+             libio-stringy-perl-native \
+             libmath-planepath-perl-native \
+             libmodule-build-withxspp-perl-native \
+             libmoo-perl-native \
+"
+
+SRC_URI = "git://github.com/alexrj/Slic3r.git"
+SRCREV = "f82a8475a1ccd7ca9ebddd31d6b60953a26b5f39"
+
+S = "${WORKDIR}/git/xs"
+
+inherit cpan_build
+
+do_configure_append() {
+    if [ "${@is_target(d)}" != "yes" ]; then
+        # for -native: Fix -lstdc++
+        sed "s:'-lstdc++'::g" -i _build/build_params
+    fi
+}
+
+do_compile_prepend() {
+    if [ "${@is_target(d)}" != "yes" ]; then
+        # for -native: Fix BUILD_LD=ld
+        export LD=g++
+        export BUILD_LD=g++
+    fi
+}
+
+do_install() {
+    perl Build install
+
+    # Fix install location of Slic3r/XS.pm
+    if [ "${@is_target(d)}" = "yes" ]; then
+        install -d ${STAGING_LIBDIR}/perl/vendor_perl/${@get_perl_version(d)}/Slic3r
+        install blib/lib/Slic3r/XS.pm ${STAGING_LIBDIR}/perl/vendor_perl/${@get_perl_version(d)}/Slic3r/XS.pm
+        install -d ${STAGING_LIBDIR}/perl/vendor_perl/${@get_perl_version(d)}/auto/Slic3r
+install -d ${STAGING_LIBDIR}/perl/vendor_perl/${@get_perl_version(d)}/auto/Slic3r/XS
+        install blib/arch/auto/Slic3r/XS/XS.* ${STAGING_LIBDIR}/perl/vendor_perl/${@get_perl_version(d)}/auto/Slic3r/XS/
+    else
+        # Install in proper location
+        # This might be due to a problem with Module::Build::WithXSpp
+        install -d ${STAGING_LIBDIR_NATIVE}/perl-native/perl/${@get_perl_version(d)}/Slic3r
+        install blib/lib/Slic3r/XS.pm ${STAGING_LIBDIR_NATIVE}/perl-native/perl/${@get_perl_version(d)}/Slic3r/XS.pm
+        install -d ${STAGING_LIBDIR_NATIVE}/perl-native/perl/${@get_perl_version(d)}/auto/Slic3r
+	install -d ${STAGING_LIBDIR_NATIVE}/perl-native/perl/${@get_perl_version(d)}/auto/Slic3r/XS
+        install blib/arch/auto/Slic3r/XS/XS.* ${STAGING_LIBDIR_NATIVE}/perl-native/perl/${@get_perl_version(d)}/auto/Slic3r/XS/
+    fi
+}
+
+RDEPENDS_${PN} = " libencode-locale-perl \
+                   libextutils-makemaker-perl \
+                   libextutils-parsexs-perl \
+                   perl-module-file-basename \
+                   perl-module-file-spec \
+                   perl-module-getopt-long \
+                   libmath-planepath-perl \
+                   libmodule-build-withxspp-perl \
+                   libmoo-perl \
+                   perl-module-scalar-util \
+                   libtest-harness-perl \
+                   libio-scalar-perl \
+                   perl-module-time-hires \
+"
+
+RECOMMENDS += " libclass-xsaccessor-perl-native \
+                libgrowl-gntp-perl-native \
+                libxml-sax-expatxs-perl-native \
+                libwx-perl-native \
+"
+
+BBCLASSEXTEND = "native"
diff --git a/meta-maker/recipes-printing/slic3r/slic3r_1.1.6.bb b/meta-maker/recipes-printing/slic3r/slic3r_1.1.6.bb
deleted file mode 100644
index 0cdcf14fc8..0000000000
--- a/meta-maker/recipes-printing/slic3r/slic3r_1.1.6.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-SUMMARY = "Slic3r - G-code generator for 3D printers"
-DESCRIPTION = "Slic3r takes 3D models (STL, OBJ, AMF) and converts them into \
-G-code instructions for 3D printers. It's compatible with any modern printer \
-based on the RepRap toolchain, including all those based on the Marlin, \
-Sprinter and Repetier firmware. It also works with Mach3 and LinuxCNC \
-controllers. \
-"
-HOMEPAGE = "http://slic3r.org/"
-SECTION = "devel"
-
-LICENSE = "AGPL-3.0 | CC-BY-3.0"
-LIC_FILES_CHKSUM = "file://../README.md;beginline=77;endline=84;md5=4e907cb01787f6711506359a57c22961"
-
-DEPENDS = "  libextutils-cppguess-perl-native \
-             libcapture-tiny-perl-native \
-             libmodule-build-withxspp-perl-native \
-             libextutils-parsexs-perl-native \
-             libextutils-typemaps-default-perl-native \
-"
-
-SRC_URI = "git://github.com/alexrj/Slic3r.git;branch=stable"
-SRCREV = "f3db14bfbe258ebb67232b68cf15e56c7b30ab30"
-
-S = "${WORKDIR}/git/xs"
-
-inherit cpan_build
-
-RDEPENDS_${PN} = " libencode-locale-perl \
-                   libextutils-makemaker-perl \
-                   libextutils-parsexs-perl \
-                   perl-module-file-basename \
-                   perl-module-file-spec \
-                   perl-module-getopt-long \
-                   libmath-planepath-perl \
-                   libmodule-build-withxspp-perl \
-                   libmoo-perl \
-                   perl-module-scalar-util \
-                   libtest-harness-perl \
-                   libio-scalar-perl \
-                   perl-module-time-hires \
-"
-
-#RECOMMENDS += " perl-module-class-xsaccessor \
-#                perl-module-growl-gntp \
-#                perl-module-xml-sax-expatxs \
-#                perl-module-wx \
-#"
-
-BBCLASSEXTEND = "native"
diff --git a/meta-maker/recipes-printing/slic3r/slic3r_git.bb b/meta-maker/recipes-printing/slic3r/slic3r_git.bb
new file mode 100644
index 0000000000..6c45a53af8
--- /dev/null
+++ b/meta-maker/recipes-printing/slic3r/slic3r_git.bb
@@ -0,0 +1,67 @@
+SUMMARY = "Slic3r - G-code generator for 3D printers"
+DESCRIPTION = "Slic3r takes 3D models (STL, OBJ, AMF) and converts them into \
+G-code instructions for 3D printers. It's compatible with any modern printer \
+based on the RepRap toolchain, including all those based on the Marlin, \
+Sprinter and Repetier firmware. It also works with Mach3 and LinuxCNC \
+controllers. \
+"
+HOMEPAGE = "http://slic3r.org/"
+SECTION = "devel"
+
+LICENSE = "AGPL-3.0 | CC-BY-3.0"
+LIC_FILES_CHKSUM = "file://README.md;beginline=77;endline=84;md5=4e907cb01787f6711506359a57c22961"
+
+export SLIC3R_NO_AUTO = "1"
+
+DEPENDS = "  libcapture-tiny-perl-native \
+             libconstant-defer-perl-native \
+             libencode-locale-perl-native \
+	     libextutils-cppguess-perl-native \
+             libextutils-parsexs-perl-native \
+	     libextutils-typemaps-default-perl-native \
+             libio-stringy-perl-native \
+             libmath-libm-perl-native \
+             libmath-planepath-perl-native \
+             libmodule-build-withxspp-perl-native \
+             libmoo-perl-native \
+             libslic3r-xs-perl-native \
+"
+PACKAGES =+ "gui"
+DEPENDS_${PN}-gui = " libwx-perl-native"
+
+RECOMMENDS_${PN}-gui = " libgrowl-gntp-perl-native \
+                         libwx-glcanvas-perl-native \
+                         libopengl-perl-native \
+"
+
+
+SRC_URI = "git://github.com/alexrj/Slic3r.git"
+SRCREV = "f82a8475a1ccd7ca9ebddd31d6b60953a26b5f39"
+
+S = "${WORKDIR}/git"
+
+inherit cpan_build
+
+RDEPENDS_${PN} = " libencode-locale-perl \
+                   libextutils-makemaker-perl \
+                   libextutils-parsexs-perl \
+                   perl-module-file-basename \
+                   perl-module-file-spec \
+                   perl-module-getopt-long \
+                   libmath-planepath-perl \
+                   libmodule-build-withxspp-perl \
+                   libmoo-perl \
+                   perl-module-scalar-util \
+                   libtest-harness-perl \
+                   libio-scalar-perl \
+                   libslic3r-xs-perl \
+                   perl-module-time-hires \
+"
+
+RECOMMENDS += " libclass-xsaccessor-perl-native \
+                libgrowl-gntp-perl-native \
+                libxml-sax-expatxs-perl-native \
+                libwx-perl-native \
+"
+
+BBCLASSEXTEND = "native"
-- 
cgit 1.2.3-korg