Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (adf724a837d577c08a1e717fbaadda377c3dd31f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (adf724a837d577c08a1e717fbaadda377c3dd31f)
  • Date: Mon, 10 Sep 2018 22:49:37 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

python-pypi/pillow/BUILD | 2 ++
python-pypi/pillow/DEPENDS | 18 ++++++++++++++----
python-pypi/pillow/HISTORY | 3 +++
3 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit adf724a837d577c08a1e717fbaadda377c3dd31f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pillow: only openjpeg >=2.0 is supported

diff --git a/python-pypi/pillow/BUILD b/python-pypi/pillow/BUILD
index 2c5ec4c..fbb97d4 100755
--- a/python-pypi/pillow/BUILD
+++ b/python-pypi/pillow/BUILD
@@ -1,3 +1,5 @@
+OPTS="${PILLOW_OPTS} ${OPTS}" &&
+
# fix build against system zlib
LDFLAGS="-L$INSTALL_ROOT/lib $LDFLAGS" &&

diff --git a/python-pypi/pillow/DEPENDS b/python-pypi/pillow/DEPENDS
index 2738543..0c22fe1 100755
--- a/python-pypi/pillow/DEPENDS
+++ b/python-pypi/pillow/DEPENDS
@@ -1,3 +1,5 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
+
depends unzip &&
depends PYTHON &&
depends SETUPTOOLS &&
@@ -7,10 +9,18 @@ optional_depends JPEG \
"--disable-jpeg" \
"for JPEG support" &&

-optional_depends openjpeg \
- "--enable-jpeg2000" \
- "--disable-jpeg2000" \
- "for JPEG 2000 support" &&
+persistent_add PILLOW_OPTS &&
+
+if spell_ok openjpeg && ! is_version_less $(gaze -q version openjpeg | awk
-F'|' '$3 == "openjpeg" {print $4}') 2.0; then
+ list_remove PILLOW_OPTS "--disable-jpeg2000" &&
+
+ optional_depends openjpeg \
+ "--enable-jpeg2000" \
+ "--disable-jpeg2000" \
+ "for JPEG 2000 support"
+else
+ list_add PILLOW_OPTS "--disable-jpeg2000"
+fi &&

optional_depends zlib \
"--enable-zlib" \
diff --git a/python-pypi/pillow/HISTORY b/python-pypi/pillow/HISTORY
index 0e33664..552d9ca 100644
--- a/python-pypi/pillow/HISTORY
+++ b/python-pypi/pillow/HISTORY
@@ -1,3 +1,6 @@
+2018-09-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, BUILD: only openjpeg >=2.0 is supported
+
2018-07-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.2.0





Archive powered by MHonArc 2.6.24.

Top of Page