From 7c338d15a7da8f9c0f33ce50624f1de1b6ccbdbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Fri, 1 May 2015 13:00:46 -0600 Subject: [PATCH 1/6] Add gcc 5.1.0 --- pkgs/gcc/gcc.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/gcc/gcc.yaml b/pkgs/gcc/gcc.yaml index 8710ab881..48c667af5 100644 --- a/pkgs/gcc/gcc.yaml +++ b/pkgs/gcc/gcc.yaml @@ -6,10 +6,17 @@ dependencies: defaults: relocatable: false + version: 4.9.2 + +when version == '4.9.2': + sources: + - key: tar.bz2:eaqmtauvqvvkcp62b4xtur4ujedvp7be + url: http://ftpmirror.gnu.org/gcc/gcc-4.9.2/gcc-4.9.2.tar.bz2 +when version == '5.1.0': + sources: + - key: tar.bz2:w7np36e4xmhcamz5x5nvgsjrtlqg4pi2 + url: http://ftpmirror.gnu.org/gcc/gcc-5.1.0/gcc-5.1.0.tar.bz2 -sources: -- key: tar.bz2:eaqmtauvqvvkcp62b4xtur4ujedvp7be - url: http://ftpmirror.gnu.org/gcc/gcc-4.9.2/gcc-4.9.2.tar.bz2 build_stages: # Make gcc automatically embed RPATH to the proper libstdc++, libgfortran, From c889cce91af01da04305ebced10ce25859e7470d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 6 Jul 2015 10:08:05 -0500 Subject: [PATCH 2/6] Add scikit-image --- pkgs/scikit-image.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 pkgs/scikit-image.yaml diff --git a/pkgs/scikit-image.yaml b/pkgs/scikit-image.yaml new file mode 100644 index 000000000..33ae1c632 --- /dev/null +++ b/pkgs/scikit-image.yaml @@ -0,0 +1,8 @@ +extends: [setuptools_package] +dependencies: + build: [numpy, scipy, cython, six] + run: [numpy, scipy, six] + +sources: +- key: tar.gz:o2hfndzstglgykklp24m2ekpyzeppp5o + url: https://pypi.python.org/packages/source/s/scikit-image/scikit-image-0.11.3.tar.gz From bfb1b85cc382bcf694b3a86892ee48856e27c9d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 6 Jul 2015 10:30:52 -0500 Subject: [PATCH 3/6] Add pillow as a dependency for scikit-image --- pkgs/scikit-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/scikit-image.yaml b/pkgs/scikit-image.yaml index 33ae1c632..878982507 100644 --- a/pkgs/scikit-image.yaml +++ b/pkgs/scikit-image.yaml @@ -1,7 +1,7 @@ extends: [setuptools_package] dependencies: build: [numpy, scipy, cython, six] - run: [numpy, scipy, six] + run: [numpy, scipy, six, pillow] sources: - key: tar.gz:o2hfndzstglgykklp24m2ekpyzeppp5o From 5c42b4df38ac58636adc212f7b04a10e6c371cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 6 Jul 2015 10:45:53 -0500 Subject: [PATCH 4/6] Update Pillow to 2.9.0 --- pkgs/pillow.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/pillow.yaml b/pkgs/pillow.yaml index 430151538..3d1e2e08e 100644 --- a/pkgs/pillow.yaml +++ b/pkgs/pillow.yaml @@ -3,8 +3,8 @@ dependencies: build: [zlib, png, freetype, openjpeg] sources: -- key: tar.gz:q5qmcgfaefplufr7o6bbcdt67tn3cx4k - url: https://pypi.python.org/packages/source/P/Pillow/Pillow-2.8.1.tar.gz +- key: tar.gz:b4lz27tv47edwy2bxfmvziptstphbaki + url: https://pypi.python.org/packages/source/P/Pillow/Pillow-2.9.0.tar.gz build_stages: - name: build_ext_options From 078ea28d2d908fd76958de79b6d7cfae51d174ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 6 Jul 2015 10:54:17 -0500 Subject: [PATCH 5/6] Update FreeType --- pkgs/freetype.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/freetype.yaml b/pkgs/freetype.yaml index 0ede8bf30..8b2a73136 100644 --- a/pkgs/freetype.yaml +++ b/pkgs/freetype.yaml @@ -4,8 +4,8 @@ dependencies: run: [zlib, bzip2] sources: -- url: http://download.savannah.gnu.org/releases/freetype/freetype-2.4.11.tar.gz - key: tar.gz:fgtq4vmghzfws73nt465yqc2rc4duml6 +- key: tar.bz2:qru7xajeozhykau4zashympbgkrmlziq + url: http://downloads.sourceforge.net/project/freetype/freetype2/2.6/freetype-2.6.tar.bz2 build_stages: From 78075ca1a4c7aed64f34585e461192593924a5ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 6 Jul 2015 10:55:40 -0500 Subject: [PATCH 6/6] Fix Pillow to link jpeg properly This fixes the following error: In [1]: from PIL import Image --------------------------------------------------------------------------- ImportError Traceback (most recent call last) in () ----> 1 from PIL import Image /home/ondrej/.hashdist/bld/profile/ikoe5ngrnono/lib/python2.7/site-packages/PIL/Image.py in () 61 # Also note that Image.core is not a publicly documented interface, 62 # and should be considered private and subject to change. ---> 63 from PIL import _imaging as core 64 if PILLOW_VERSION != getattr(core, 'PILLOW_VERSION', None): 65 raise ImportError("The _imaging extension was built for another " ImportError: libopenjp2.so.7: cannot open shared object file: No such file or directory --- pkgs/pillow.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/pillow.yaml b/pkgs/pillow.yaml index 3d1e2e08e..e3c944ddc 100644 --- a/pkgs/pillow.yaml +++ b/pkgs/pillow.yaml @@ -1,4 +1,4 @@ -extends: [setuptools_package] +extends: [setuptools_package, libflags] dependencies: build: [zlib, png, freetype, openjpeg] @@ -12,4 +12,5 @@ build_stages: before: install handler: bash bash: | + export MAX_CONCURRENCY=1 export SETUPTOOLS_PACKAGE_EXTRA_OPTIONS="build_ext --enable-zlib --enable-freetype --enable-jpeg2000 --include-dirs=${ZLIB_DIR}/include:${PNG_DIR}/include:${FREETYPE_DIR}/include:${OPENJPEG_DIR}/include --library-dirs=${ZLIB_DIR}/lib:${PNG_DIR}/lib:${FREETYPE_DIR}/lib:${OPENJPEG_DIR}/lib"