home *** CD-ROM | disk | FTP | other *** search
/ OS/2 Shareware BBS: 10 Tools / 10-Tools.zip / pypil112.zip / Imaging-1.1.2-os2emx.patch next >
Text File  |  2001-08-06  |  6KB  |  224 lines
  1. diff -crN Imaging-1.1.2/_imaging.c Imaging-1.1.2-os2emx/_imaging.c
  2. *** Imaging-1.1.2/_imaging.c    Thu May  3 20:57:38 2001
  3. --- Imaging-1.1.2-os2emx/_imaging.c    Sat Jul 14 21:26:30 2001
  4. ***************
  5. *** 61,67 ****
  6. --- 61,69 ----
  7.   /* Configuration stuff. Feel free to undef things you don't need. */
  8.   #define WITH_IMAGECHOPS /* ImageChops support */
  9.   #define    WITH_IMAGEDRAW /* ImageDraw support */
  10. + #ifndef __EMX__        /* OS/2 + EMX don't have mmap support */
  11.   #define    WITH_MAPPING /* use memory mapping to read some file formats */
  12. + #endif
  13.   #define    WITH_IMAGEPATH /* ImagePath stuff */
  14.   #define    WITH_ARROW /* arrow graphics stuff (experimental) */
  15.   #define    WITH_EFFECTS /* special effects */
  16. ***************
  17. *** 76,81 ****
  18. --- 78,87 ----
  19.   #define B16(p, i) ((((int)p[(i)]) << 8) + p[(i)+1])
  20.   #define L16(p, i) ((((int)p[(i)+1]) << 8) + p[(i)])
  21.   #define S16(v) ((v) < 32768 ? (v) : ((v) - 65536))
  22. + 
  23. + #ifdef __EMX__
  24. + #define    _fill    _pil_fill /* EMX already has a _fill() */
  25. + #endif
  26.   
  27.   /* -------------------------------------------------------------------- */
  28.   /* OBJECT ADMINISTRATION                        */
  29. diff -crN Imaging-1.1.2/BUILD Imaging-1.1.2-os2emx/BUILD
  30. *** Imaging-1.1.2/BUILD    Thu May  3 20:57:38 2001
  31. --- Imaging-1.1.2-os2emx/BUILD    Thu Jan  1 00:00:00 1970
  32. ***************
  33. *** 1,9 ****
  34. - # quick build (for lazy programmers).  for more information on the
  35. - # build process, see the README file.
  36. - 
  37. - cd libImaging
  38. - ./configure
  39. - make
  40. - cd ..
  41. - make -f Makefile.pre.in boot
  42. - make
  43. --- 0 ----
  44. diff -crN Imaging-1.1.2/BUILD.txt Imaging-1.1.2-os2emx/BUILD.txt
  45. *** Imaging-1.1.2/BUILD.txt    Thu Jan  1 00:00:00 1970
  46. --- Imaging-1.1.2-os2emx/BUILD.txt    Thu May  3 20:57:38 2001
  47. ***************
  48. *** 0 ****
  49. --- 1,9 ----
  50. + # quick build (for lazy programmers).  for more information on the
  51. + # build process, see the README file.
  52. + 
  53. + cd libImaging
  54. + ./configure
  55. + make
  56. + cd ..
  57. + make -f Makefile.pre.in boot
  58. + make
  59. diff -crN Imaging-1.1.2/libImaging/ImConfig.h Imaging-1.1.2-os2emx/libImaging/ImConfig.h
  60. *** Imaging-1.1.2/libImaging/ImConfig.h    Fri May  4 21:16:36 2001
  61. --- Imaging-1.1.2-os2emx/libImaging/ImConfig.h    Mon Aug  6 22:00:42 2001
  62. ***************
  63. *** 25,31 ****
  64. --- 25,33 ----
  65.    * later.  It might need some tweaking to work with other compilers,
  66.    * including 16-bit environments. */
  67.   #ifndef    WIN32
  68. + #ifndef __EMX__
  69.   #define    WIN32
  70. + #endif
  71.   #endif
  72.   
  73.   /* VC++ 4.0 is a bit annoying when it comes to precision issues (like
  74. diff -crN Imaging-1.1.2/libImaging/Makefile.os2emx Imaging-1.1.2-os2emx/libImaging/Makefile.os2emx
  75. *** Imaging-1.1.2/libImaging/Makefile.os2emx    Thu Jan  1 00:00:00 1970
  76. --- Imaging-1.1.2-os2emx/libImaging/Makefile.os2emx    Mon Aug  6 21:42:16 2001
  77. ***************
  78. *** 0 ****
  79. --- 1,94 ----
  80. + #
  81. + # The Python Imaging Library.
  82. + #
  83. + # makefile for OS/2 + EMX 0.9d/gcc 2.8.1
  84. + # - created by Andrew MacIntyre, 2001/7/14
  85. + #
  86. + # This makefile compiles and tests the Imaging core library.
  87. + #
  88. + # To build with the IJG JPEG and ZLIB libraries, you may have
  89. + # to change the JPEGINCLUDE setting.
  90. + #
  91. + # Copyright (c) Fredrik Lundh 1995-96.  All rights reserved.
  92. + # Copyright (c) Secret Labs AB 1996-97.
  93. + #
  94. + # See the README file for information on usage and redistribution.
  95. + #
  96. + 
  97. + all: imaging.lib
  98. + 
  99. + #JPEGINCLUDE=    -I../jpeg-6a
  100. + #ZLIBINCLUDE=    -I../zlib
  101. + 
  102. + CC=        gcc
  103. + CFLAGS=        -Zmt -s -O2
  104. + 
  105. + OUTLIB=        imaging.a
  106. + OMFLIB=        imaging.lib
  107. + 
  108. + OBJS=        Access.o\
  109. +         Bands.o\
  110. +         BitDecode.o\
  111. +         Blend.o\
  112. +         Chops.o\
  113. +         Convert.o\
  114. +         ConvertYCbCr.o\
  115. +         Copy.o\
  116. +         Crc32.o\
  117. +         Crop.o\
  118. +         Dib.o\
  119. +         Draw.o\
  120. +         Effects.o\
  121. +         EpsEncode.o\
  122. +         Except.o\
  123. +         File.o\
  124. +         Fill.o\
  125. +         Filter.o\
  126. +         FliDecode.o\
  127. +         Geometry.o\
  128. +         GetBBox.o\
  129. +         GifDecode.o\
  130. +         GifEncode.o\
  131. +         HexDecode.o\
  132. +         Histo.o\
  133. +         JpegDecode.o\
  134. +         JpegEncode.o\
  135. +         LzwDecode.o\
  136. +         Matrix.o\
  137. +         MspDecode.o\
  138. +         Negative.o\
  139. +         Offset.o\
  140. +         Pack.o\
  141. +         PackDecode.o\
  142. +         Palette.o\
  143. +         Paste.o\
  144. +         Quant.o\
  145. +         QuantHash.o\
  146. +         QuantHeap.o\
  147. +         PcdDecode.o\
  148. +         PcxDecode.o\
  149. +         PcxEncode.o\
  150. +         Point.o\
  151. +         RawDecode.o\
  152. +         RawEncode.o\
  153. +         Storage.o\
  154. +         SunRleDecode.o\
  155. +         TgaRleDecode.o\
  156. +         Unpack.o\
  157. +         UnpackYCC.o\
  158. +         XbmDecode.o\
  159. +         XbmEncode.o\
  160. +         ZipDecode.o\
  161. +         ZipEncode.o
  162. + 
  163. + $(OUTLIB):    $(OBJS)
  164. +         ar -crs $(OUTLIB) $(OBJS)
  165. + 
  166. + $(OMFLIB):    $(OUTLIB)
  167. +         emxomf -l -o $(OMFLIB) $(OUTLIB)
  168. + 
  169. + coretest.exe: coretest.c $(OUTLIB)
  170. +     $(CC) $(CFLAGS) -o coretest.exe coretest.c $(OUTLIB)
  171. + 
  172. + test:    coretest.exe
  173. +     coretest.exe
  174. Binary files Imaging-1.1.2/libImaging/wedge.ppm and Imaging-1.1.2-os2emx/libImaging/wedge.ppm differ
  175. diff -crN Imaging-1.1.2/setup.py Imaging-1.1.2-os2emx/setup.py
  176. *** Imaging-1.1.2/setup.py    Thu Jan  1 00:00:00 1970
  177. --- Imaging-1.1.2-os2emx/setup.py    Sat Jul 14 21:37:58 2001
  178. ***************
  179. *** 0 ****
  180. --- 1,43 ----
  181. + #!/usr/bin/env python
  182. + # To use:
  183. + #       python setup.py install
  184. + #
  185. + import os, sys, string, re
  186. + from glob import glob
  187. + import distutils
  188. + from distutils.core import setup, Extension
  189. + 
  190. + headers = glob (os.path.join ("libImaging","*.h"))
  191. + 
  192. + # The version is set in Lib/numeric_version.py
  193. + #execfile(os.path.join('Lib','numeric_version.py'))
  194. + PIL_version = '1.1.2'
  195. + 
  196. + # You might need to add a case here for your system
  197. + #library_dir_list = []
  198. + 
  199. + setup (name = "PIL",
  200. +        version = PIL_version,
  201. +        maintainer = "Pythonware",
  202. +        maintainer_email = "image-sig@python.org",
  203. +        description = "Python Imaging Library",
  204. +        url = "http://www.pythonware.com/products/pil/",
  205. + 
  206. +        packages = [''],
  207. +        extra_path = 'PIL',
  208. +        package_dir = {'': 'PIL'},
  209. +        include_dirs = ['libImaging'],
  210. +        ext_modules = [Extension('_imaging',
  211. +                                 ['_imaging.c',
  212. +                  'decode.c',
  213. +                  'encode.c',
  214. +                  'map.c',
  215. +                  'display.c',
  216. +                  'outline.c',
  217. +                  'path.c'],
  218. +                 library_dirs = ['libImaging'],
  219. +                 libraries = ['imaging', 'jpeg', 'z']),
  220. +                      ]
  221. +        )
  222. + print "PIL Version", PIL_version
  223. + 
  224.