Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (61aa2b88bfcb75acd0f4221f17e0f91fa9453370)

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 stable-0.62 grimoire by Vlad Glagolev (61aa2b88bfcb75acd0f4221f17e0f91fa9453370)
  • Date: Tue, 14 Apr 2015 09:19:50 -0500

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 3 ++
python-pypi/FUNCTIONS | 8 +++---
python-pypi/pillow/BUILD | 4 +++
python-pypi/pillow/DEPENDS | 56
+++++++++++++++++++++++++++++++--------------
python-pypi/pillow/DETAILS | 11 ++++----
python-pypi/pillow/HISTORY | 8 ++++++
python-pypi/pillow/INSTALL | 1
7 files changed, 65 insertions(+), 26 deletions(-)

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

pillow: => 2.8.1

(cherry picked from commit 4b59a4aea592accc1eb92719a5a8f120cd0724ab)

commit 717a9b293ed3e37822c07e09f65a6b71a41555f5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

python-pypi/FUNCTIONS: fixed arguments' passing to the root FUNCTIONS

(cherry picked from commit ef2ee0cbebd9faa085e7879dfe5e4ba3fc02e149)

Conflicts:
ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 6f106fc..443ce12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-04-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * python-pypi/FUNCTIONS: fixed arguments' passing to the root
FUNCTIONS
+
2015-04-02 Vlad Glagolev <stealth AT sourcemage.org>
* kernel.gpg: added C4790F9D public key (Linux Kernel Archives
Verification Key (One-off resigning of old releases)
diff --git a/python-pypi/FUNCTIONS b/python-pypi/FUNCTIONS
index 24bd4c0..7bb7e0b 100755
--- a/python-pypi/FUNCTIONS
+++ b/python-pypi/FUNCTIONS
@@ -3,9 +3,9 @@
#-------------------------------------------------------------------------
function default_build() {
if is_depends_enabled $SPELL python;then
- default_build_python
+ default_build_python "$@"
else
- default_build_python3
+ default_build_python3 "$@"
fi
}

@@ -14,8 +14,8 @@ function default_build() {
#-------------------------------------------------------------------------
function default_install() {
if is_depends_enabled $SPELL python;then
- default_install_python
+ default_install_python "$@"
else
- default_install_python3
+ default_install_python3 "$@"
fi
}
diff --git a/python-pypi/pillow/BUILD b/python-pypi/pillow/BUILD
new file mode 100755
index 0000000..a46e6c4
--- /dev/null
+++ b/python-pypi/pillow/BUILD
@@ -0,0 +1,4 @@
+local PYTHON="$(get_spell_provider_file $SPELL PYTHON
'/usr/bin/python[0-9\.]*$')" &&
+
+$PYTHON setup.py build_py build_scripts &&
+$PYTHON setup.py build_ext $OPTS
diff --git a/python-pypi/pillow/DEPENDS b/python-pypi/pillow/DEPENDS
index 4ec4bfc..e488b38 100755
--- a/python-pypi/pillow/DEPENDS
+++ b/python-pypi/pillow/DEPENDS
@@ -1,30 +1,52 @@
+depends unzip &&
depends PYTHON &&
depends SETUPTOOLS &&
+
optional_depends JPEG \
- "" \
- "" \
+ "--enable-jpeg" \
+ "--disable-jpeg" \
"for JPEG support" &&
+
+optional_depends openjpeg \
+ "--enable-jpeg2000" \
+ "--disable-jpeg2000" \
+ "for JPEG 2000 support" &&
+
optional_depends zlib \
- "" \
- "" \
+ "--enable-zlib" \
+ "--disable-zlib" \
"for compressed PNG support" &&
+
optional_depends freetype2 \
- "" \
- "" \
+ "--enable-freetype" \
+ "--disable-freetype" \
"for OpenType/TrueType support" &&
-optional_depends tk \
- "" \
- "" \
- "for TkInter support" &&
-optional_depends littlecms \
- "" \
- "" \
+
+if is_depends_enabled $(get_spell_provider $SPELL PYTHON) tk; then
+ optional_depends tcl \
+ "--enable-tcl" \
+ "--disable-tcl" \
+ "for TCL support" &&
+
+ optional_depends tk \
+ "--enable-tk" \
+ "--disable-tk" \
+ "for TkInter support"
+fi &&
+
+optional_depends lcms2 \
+ "--enable-lcms" \
+ "--disable-lcms" \
"for color managment" &&
+
optional_depends libwebp \
- "" \
- "" \
+ "--enable-webp" \
+ "--disable-webp" \
"for the Webp format" &&
+
+# TODO: --enable/--disable-webpmux for libwebpmux subdep in libwebp spell
+
optional_depends tiff \
- "" \
- "" \
+ "--enable-tiff" \
+ "--disable-tiff" \
"for TIFF support"
diff --git a/python-pypi/pillow/DETAILS b/python-pypi/pillow/DETAILS
index 8d3814c..3748924 100755
--- a/python-pypi/pillow/DETAILS
+++ b/python-pypi/pillow/DETAILS
@@ -1,9 +1,10 @@
SPELL=pillow
- VERSION=2.4.0
- SOURCE="Pillow-${VERSION}.zip"
- SOURCE_URL[0]=https://pypi.python.org/packages/source/P/Pillow/${SOURCE}
-
SOURCE_HASH=sha512:8eaf087dd30f02792398d8b219a829289776c26cf014fbce6658f355e07548abec67c4e1f1203d58b938a86bdce17ceb3764b2024e095f894fc06caf05c99789
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Pillow-${VERSION}"
+ SPELLX=Pillow
+ VERSION=2.8.1
+ SOURCE="${SPELLX}-${VERSION}.zip"
+
SOURCE_URL[0]=https://pypi.python.org/packages/source/P/${SPELLX}/${SOURCE}
+
SOURCE_HASH=sha512:75c0cfb53530549a2bac66cc3457747c239779233c64fe944fa661e7401acd915700e0dfd74e13c93d96afb9b50a112f09cbaea49205e83d8797e832a52534e4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE="http://python-imaging.github.io/";
LICENSE[0]=PIL
ENTERED=20130814
diff --git a/python-pypi/pillow/HISTORY b/python-pypi/pillow/HISTORY
index ed15b97..d61982d 100644
--- a/python-pypi/pillow/HISTORY
+++ b/python-pypi/pillow/HISTORY
@@ -1,3 +1,11 @@
+2015-04-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.8.1; use SPELLX
+ * DEPENDS: rewritten -- added missing required dependency (unzip);
fixed
+ broken optional dependency (littlecms -> lcms2, see setup.py); added
+ missing optional dependency (openjpeg); added flags
+ * BUILD: added, to use OPTS
+ * INSTALL: added, to skip rebuilding everything on install
+
2014-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.4.0

diff --git a/python-pypi/pillow/INSTALL b/python-pypi/pillow/INSTALL
new file mode 100755
index 0000000..f8bae5b
--- /dev/null
+++ b/python-pypi/pillow/INSTALL
@@ -0,0 +1 @@
+default_install --skip-build



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (61aa2b88bfcb75acd0f4221f17e0f91fa9453370), Vlad Glagolev, 04/14/2015

Archive powered by MHonArc 2.6.24.

Top of Page