Skip to Content.
Sympa Menu

sm-commit - Re: [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: Pavel Vinogradov <vin.public AT gmail.com>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (adf724a837d577c08a1e717fbaadda377c3dd31f)
  • Date: Mon, 10 Sep 2018 20:57:10 -0400

installed_version maybe?

On Mon, Sep 10, 2018 at 10:49:37PM +0000, Vlad Glagolev wrote:
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/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" \

--
Sincerely,
Pavel Vinogradov

Attachment: signature.asc
Description: PGP signature




Archive powered by MHonArc 2.6.24.

Top of Page