| 1 |
floppym 13/06/06 05:07:45 |
| 2 |
|
| 3 |
Added: cgkit-py3k-pillow.patch cgkit-py2k-pillow.patch |
| 4 |
Log: |
| 5 |
Version bump. Convert to distutils-r1. Enable python3. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-python/cgkit/files/cgkit-py3k-pillow.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cgkit/files/cgkit-py3k-pillow.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cgkit/files/cgkit-py3k-pillow.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: cgkit-py3k-pillow.patch |
| 16 |
=================================================================== |
| 17 |
From 1953081269ce1cfdf29023a8590db40312c43194 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Mike Gilbert <floppym@g.o> |
| 19 |
Date: Wed, 5 Jun 2013 20:39:05 -0400 |
| 20 |
Subject: [PATCH] Update PIL imports for compatibility with Pillow |
| 21 |
|
| 22 |
--- |
| 23 |
cgkit/_Image.py | 2 +- |
| 24 |
cgkit/_ImageDraw.py | 2 +- |
| 25 |
cgkit/riutil.py | 2 +- |
| 26 |
utilities/checkenv.py | 2 +- |
| 27 |
utilities/postbake.py | 3 ++- |
| 28 |
5 files changed, 6 insertions(+), 5 deletions(-) |
| 29 |
|
| 30 |
diff --git a/cgkit/_Image.py b/cgkit/_Image.py |
| 31 |
index 7266d4b..0122cd2 100644 |
| 32 |
--- a/cgkit/_Image.py |
| 33 |
+++ b/cgkit/_Image.py |
| 34 |
@@ -38,7 +38,7 @@ |
| 35 |
try: |
| 36 |
|
| 37 |
# Try to import the original module... |
| 38 |
- from Image import * |
| 39 |
+ from PIL.Image import * |
| 40 |
|
| 41 |
except ImportError: |
| 42 |
|
| 43 |
diff --git a/cgkit/_ImageDraw.py b/cgkit/_ImageDraw.py |
| 44 |
index dfd6cf8..d1d3cff 100644 |
| 45 |
--- a/cgkit/_ImageDraw.py |
| 46 |
+++ b/cgkit/_ImageDraw.py |
| 47 |
@@ -38,7 +38,7 @@ |
| 48 |
try: |
| 49 |
|
| 50 |
# Try to import the original module... |
| 51 |
- from ImageDraw import * |
| 52 |
+ from PIL.ImageDraw import * |
| 53 |
|
| 54 |
except ImportError: |
| 55 |
|
| 56 |
diff --git a/cgkit/riutil.py b/cgkit/riutil.py |
| 57 |
index b51f192..ae0fba2 100644 |
| 58 |
--- a/cgkit/riutil.py |
| 59 |
+++ b/cgkit/riutil.py |
| 60 |
@@ -38,7 +38,7 @@ import types, sys, getpass |
| 61 |
from .cgtypes import vec3 |
| 62 |
from .ri import * |
| 63 |
try: |
| 64 |
- import Image |
| 65 |
+ from PIL import Image |
| 66 |
_PIL_installed = 1 |
| 67 |
except ImportError: |
| 68 |
_PIL_installed = 0 |
| 69 |
diff --git a/utilities/checkenv.py b/utilities/checkenv.py |
| 70 |
index dda600f..8b6f74e 100644 |
| 71 |
--- a/utilities/checkenv.py |
| 72 |
+++ b/utilities/checkenv.py |
| 73 |
@@ -96,7 +96,7 @@ visualize them. You can obtain PyOpenGL at http://pyopengl.sourceforge.net/ |
| 74 |
# Check PIL |
| 75 |
chkmsg("PIL") |
| 76 |
try: |
| 77 |
- import Image |
| 78 |
+ from PIL import Image |
| 79 |
print("is installed") |
| 80 |
except: |
| 81 |
print("missing") |
| 82 |
diff --git a/utilities/postbake.py b/utilities/postbake.py |
| 83 |
index 90e3140..27728c2 100644 |
| 84 |
--- a/utilities/postbake.py |
| 85 |
+++ b/utilities/postbake.py |
| 86 |
@@ -34,7 +34,8 @@ |
| 87 |
# |
| 88 |
# ***** END LICENSE BLOCK ***** |
| 89 |
|
| 90 |
-import sys, optparse, Image |
| 91 |
+import sys, optparse |
| 92 |
+from PIL import Image |
| 93 |
|
| 94 |
# shift |
| 95 |
def shift(img, dx, dy): |
| 96 |
-- |
| 97 |
1.8.2.1 |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
|
| 102 |
1.1 dev-python/cgkit/files/cgkit-py2k-pillow.patch |
| 103 |
|
| 104 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cgkit/files/cgkit-py2k-pillow.patch?rev=1.1&view=markup |
| 105 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cgkit/files/cgkit-py2k-pillow.patch?rev=1.1&content-type=text/plain |
| 106 |
|
| 107 |
Index: cgkit-py2k-pillow.patch |
| 108 |
=================================================================== |
| 109 |
From 83cb693954f6f56e50a1aa90d935e94e9e8bac8e Mon Sep 17 00:00:00 2001 |
| 110 |
From: Mike Gilbert <floppym@g.o> |
| 111 |
Date: Wed, 5 Jun 2013 20:39:05 -0400 |
| 112 |
Subject: [PATCH] Update PIL imports for compatibility with Pillow |
| 113 |
|
| 114 |
--- |
| 115 |
cgkit/_Image.py | 2 +- |
| 116 |
cgkit/_ImageDraw.py | 2 +- |
| 117 |
cgkit/riutil.py | 2 +- |
| 118 |
utilities/checkenv.py | 2 +- |
| 119 |
utilities/postbake.py | 3 ++- |
| 120 |
5 files changed, 6 insertions(+), 5 deletions(-) |
| 121 |
|
| 122 |
diff --git a/cgkit/_Image.py b/cgkit/_Image.py |
| 123 |
index 7266d4b..0122cd2 100644 |
| 124 |
--- a/cgkit/_Image.py |
| 125 |
+++ b/cgkit/_Image.py |
| 126 |
@@ -38,7 +38,7 @@ |
| 127 |
try: |
| 128 |
|
| 129 |
# Try to import the original module... |
| 130 |
- from Image import * |
| 131 |
+ from PIL.Image import * |
| 132 |
|
| 133 |
except ImportError: |
| 134 |
|
| 135 |
diff --git a/cgkit/_ImageDraw.py b/cgkit/_ImageDraw.py |
| 136 |
index dfd6cf8..d1d3cff 100644 |
| 137 |
--- a/cgkit/_ImageDraw.py |
| 138 |
+++ b/cgkit/_ImageDraw.py |
| 139 |
@@ -38,7 +38,7 @@ |
| 140 |
try: |
| 141 |
|
| 142 |
# Try to import the original module... |
| 143 |
- from ImageDraw import * |
| 144 |
+ from PIL.ImageDraw import * |
| 145 |
|
| 146 |
except ImportError: |
| 147 |
|
| 148 |
diff --git a/cgkit/riutil.py b/cgkit/riutil.py |
| 149 |
index 301e0f6..ae373c3 100644 |
| 150 |
--- a/cgkit/riutil.py |
| 151 |
+++ b/cgkit/riutil.py |
| 152 |
@@ -38,7 +38,7 @@ import types, sys, getpass |
| 153 |
from cgtypes import vec3 |
| 154 |
from ri import * |
| 155 |
try: |
| 156 |
- import Image |
| 157 |
+ from PIL import Image |
| 158 |
_PIL_installed = 1 |
| 159 |
except ImportError: |
| 160 |
_PIL_installed = 0 |
| 161 |
diff --git a/utilities/checkenv.py b/utilities/checkenv.py |
| 162 |
index b95dbf7..c93235e 100644 |
| 163 |
--- a/utilities/checkenv.py |
| 164 |
+++ b/utilities/checkenv.py |
| 165 |
@@ -96,7 +96,7 @@ visualize them. You can obtain PyOpenGL at http://pyopengl.sourceforge.net/ |
| 166 |
# Check PIL |
| 167 |
chkmsg("PIL") |
| 168 |
try: |
| 169 |
- import Image |
| 170 |
+ from PIL import Image |
| 171 |
print "is installed" |
| 172 |
except: |
| 173 |
print "missing" |
| 174 |
diff --git a/utilities/postbake.py b/utilities/postbake.py |
| 175 |
index cadd11d..74f894a 100644 |
| 176 |
--- a/utilities/postbake.py |
| 177 |
+++ b/utilities/postbake.py |
| 178 |
@@ -34,7 +34,8 @@ |
| 179 |
# |
| 180 |
# ***** END LICENSE BLOCK ***** |
| 181 |
|
| 182 |
-import sys, optparse, Image |
| 183 |
+import sys, optparse |
| 184 |
+from PIL import Image |
| 185 |
|
| 186 |
# shift |
| 187 |
def shift(img, dx, dy): |
| 188 |
-- |
| 189 |
1.8.2.1 |
Archives