python_imaging: use libjpeg and libpng.

This commit is contained in:
Adrien Destugues
2015-11-29 10:32:49 +01:00
parent 10c81e88c6
commit 3de62a6054
2 changed files with 42 additions and 1 deletions

View File

@@ -0,0 +1,35 @@
From c51fc3e85f60cf905b8620c751fd97fcc4e185c4 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 29 Nov 2015 10:17:56 +0100
Subject: Fix libraries search paths.
diff --git a/setup.py b/setup.py
index 5d4d53a..844e386 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ except OSError:
def libinclude(root):
# map root to (root/lib, root/include)
- return os.path.join(root, "lib"), os.path.join(root, "include")
+ return os.path.join(root, "develop/lib"), os.path.join(root, "develop/headers")
# --------------------------------------------------------------------
# Library pointers.
@@ -34,9 +34,9 @@ def libinclude(root):
# TIFF_ROOT = libinclude("/opt/tiff")
TCL_ROOT = None
-JPEG_ROOT = None
-ZLIB_ROOT = None
-TIFF_ROOT = None
+JPEG_ROOT = libinclude("/system")
+ZLIB_ROOT = libinclude("/system")
+TIFF_ROOT = libinclude("/system")
FREETYPE_ROOT = None
LCMS_ROOT = None
--
2.2.2

View File

@@ -8,12 +8,13 @@ COPYRIGHT="
1995-2011 by Fredrik Lundh
"
ARCHITECTURES="x86_gcc2"
REVISION="1"
REVISION="2"
HOMEPAGE="http://www.pythonware.com/products/pil/"
SOURCE_URI="http://effbot.org/downloads/Imaging-1.1.7.tar.gz"
CHECKSUM_SHA256="895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211"
SOURCE_DIR="Imaging-1.1.7"
PATCHES="python_imaging-$portVersion.patchset"
PROVIDES="
python_imaging$secondaryArchSuffix = $portVersion
@@ -24,6 +25,11 @@ PROVIDES="
cmd:pilprint.py
"
REQUIRES="
lib:libjpeg
lib:libz
"
BUILD_REQUIRES="
devel:libjpeg
devel:libz