diff options
| author | Cory Fields <theuni-nospam-@xbmc.org> | 2013-03-13 19:53:25 -0400 |
|---|---|---|
| committer | Cory Fields <theuni-nospam-@xbmc.org> | 2013-03-13 19:53:25 -0400 |
| commit | 4150e9309ea90d8fa1a311c4b5482ee43fbb12f6 (patch) | |
| tree | 5886afc571d837fc2161f7a6c14b96f9addf1dfd /tools | |
| parent | 885a60e70edb8e8ae4ff66d5b1bd5d4eb36bda21 (diff) | |
depends: fix pil include path, it's not guarded from system libzip
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/pythonmodule-pil/Imaging-1.1.7-zip-include.patch | 22 | ||||
| -rw-r--r-- | tools/depends/target/pythonmodule-pil/Makefile | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/tools/depends/target/pythonmodule-pil/Imaging-1.1.7-zip-include.patch b/tools/depends/target/pythonmodule-pil/Imaging-1.1.7-zip-include.patch new file mode 100644 index 0000000000..fbd54e2802 --- /dev/null +++ b/tools/depends/target/pythonmodule-pil/Imaging-1.1.7-zip-include.patch @@ -0,0 +1,22 @@ +--- encode.c 2009-11-02 06:46:30.000000000 -0500 ++++ encode.c 2013-03-13 19:47:36.156302056 -0400 +@@ -426,7 +426,7 @@ + + #ifdef HAVE_LIBZ + +-#include "Zip.h" ++#include "libImaging/Zip.h" + + PyObject* + PyImaging_ZipEncoderNew(PyObject* self, PyObject* args) +--- decode.c 2009-11-02 06:46:46.000000000 -0500 ++++ decode.c 2013-03-13 19:47:53.326302045 -0400 +@@ -602,7 +602,7 @@ + + #ifdef HAVE_LIBZ + +-#include "Zip.h" ++#include "libImaging/Zip.h" + + PyObject* + PyImaging_ZipDecoderNew(PyObject* self, PyObject* args) diff --git a/tools/depends/target/pythonmodule-pil/Makefile b/tools/depends/target/pythonmodule-pil/Makefile index 2adc5dc693..4dee27fcae 100644 --- a/tools/depends/target/pythonmodule-pil/Makefile +++ b/tools/depends/target/pythonmodule-pil/Makefile @@ -29,6 +29,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) cd $(PLATFORM); patch -p1 < ../Imaging-1.1.7-crosscompiling-0.1.patch cd $(PLATFORM); patch -p1 < ../Imaging-1.1.7-setuptools-0.1.patch cd $(PLATFORM); patch -p1 < ../Imaging-1.1.7-access.patch + cd $(PLATFORM); patch -p0 < ../Imaging-1.1.7-zip-include.patch cd $(PLATFORM); sed -ie "s|"darwin"|"darwinNot"|g" "setup.py" sed -ie "s|ZLIB_ROOT = None|ZLIB_ROOT = libinclude(\"$(ZLIBROOT)\")|" $(PLATFORM)/setup.py |