# HG changeset patch # User Norm Jacobs # Date 1374815477 25200 # Node ID ba566c81fae8cea730026bb452896ed01d1be3b9 # Parent 6809170bfb95af22cb34ffcef79d72e8b9fd0e35 15820216 SUNBT7202656 Move python/imaging from Desktop consolidation to Userland diff -r 6809170bfb95 -r ba566c81fae8 components/meta-packages/history/SUNWpython26-imaging.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/meta-packages/history/SUNWpython26-imaging.p5m Thu Jul 25 22:11:17 2013 -0700 @@ -0,0 +1,30 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +# + +# +# Legacy package information for renamed SUNWpython26-imaging package +# +set name=pkg.fmri value=pkg:/SUNWpython26-imaging@0.5.11,5.11-0.175.0.0.0.0.0 +set name=pkg.renamed value=true + +depend fmri=library/python-2/python-imaging-26@0.5.11-0.133 type=require diff -r 6809170bfb95 -r ba566c81fae8 components/python/imaging/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/python/imaging/Makefile Thu Jul 25 22:11:17 2013 -0700 @@ -0,0 +1,60 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +# + +include ../../../make-rules/shared-macros.mk + +COMPONENT_NAME= Imaging +COMPONENT_VERSION= 1.1.7 +COMPONENT_PROJECT_URL= http://www.pythonware.com/products/pil/ +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz +COMPONENT_ARCHIVE_HASH= \ + sha256:895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211 +COMPONENT_ARCHIVE_URL= http://effbot.org/downloads/$(COMPONENT_ARCHIVE) +COMPONENT_BUGDB= python-mod/pil + +include $(WS_TOP)/make-rules/prep.mk +include $(WS_TOP)/make-rules/setup.py.mk +include $(WS_TOP)/make-rules/ips.mk + +TEST_PYTHONPATH.32 = $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL +TEST_PYTHONPATH.64 = $(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL:$(PROTO_DIR)/usr/lib/python$(PYTHON_VERSION)/vendor-packages/PIL/64 + +COMPONENT_TEST_DIR= $(COMPONENT_SRC) +COMPONENT_TEST_ARGS= ./selftest.py +COMPONENT_TEST_ENV= PYTHONPATH=$(TEST_PYTHONPATH.$(BITS)) + +ASLR_MODE = $(ASLR_ENABLE) + +# common targets +build: $(BUILD_32_and_64) + +install: $(INSTALL_32_and_64) + +test: $(TEST_32_and_64) + +BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) + +include $(WS_TOP)/make-rules/depend.mk diff -r 6809170bfb95 -r ba566c81fae8 components/python/imaging/imaging-GENFRAG.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/python/imaging/imaging-GENFRAG.p5m Thu Jul 25 22:11:17 2013 -0700 @@ -0,0 +1,29 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +# + +# python-imaging was previously in the 'desktop' consolidation. This optional +# dependency is here to facilitate the safe transfer of the package +# to the 'userland' consolidation. +depend type=optional fmri=consolidation/desktop/desktop-incorporation@0.5.11,5.11-0.175.2.0.0.20.0 diff -r 6809170bfb95 -r ba566c81fae8 components/python/imaging/imaging-PYVER.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/python/imaging/imaging-PYVER.p5m Thu Jul 25 22:11:17 2013 -0700 @@ -0,0 +1,163 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +# + + default mangler.man.stability uncommitted> +set name=pkg.fmri \ + value=pkg:/library/python-2/python-imaging-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="Python's own image processing library" +set name=pkg.description \ + value="The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library provides extensive file format support, an efficient internal representation, and powerful image processing capabilities." +set name=com.oracle.info.description value="the Python imaging library" +set name=info.classification \ + value=org.opensolaris.category.2008:Development/Python +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) +set name=org.opensolaris.arc-caseid value=PSARC/2008/102 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +file build/$(MACH32)-$(PYVER)/scripts-$(PYVER)/pilconvert.py \ + path=usr/bin/pilconvert-$(PYVER).py pkg.tmp.autopyc=false +link path=usr/bin/pilconvert.py target=pilconvert-$(PYVER).py mediator=python \ + mediator-version=$(PYVER) +file build/$(MACH32)-$(PYVER)/scripts-$(PYVER)/pildriver.py \ + path=usr/bin/pildriver-$(PYVER).py pkg.depend.bypass-generate=.* \ + pkg.tmp.autopyc=false +link path=usr/bin/pildriver.py target=pildriver-$(PYVER).py mediator=python \ + mediator-version=$(PYVER) +file build/$(MACH32)-$(PYVER)/scripts-$(PYVER)/pilfile.py \ + path=usr/bin/pilfile-$(PYVER).py pkg.tmp.autopyc=false +link path=usr/bin/pilfile.py target=pilfile-$(PYVER).py mediator=python \ + mediator-version=$(PYVER) +file build/$(MACH32)-$(PYVER)/scripts-$(PYVER)/pilfont.py \ + path=usr/bin/pilfont-$(PYVER).py pkg.tmp.autopyc=false +link path=usr/bin/pilfont.py target=pilfont-$(PYVER).py mediator=python \ + mediator-version=$(PYVER) +file build/$(MACH32)-$(PYVER)/scripts-$(PYVER)/pilprint.py \ + path=usr/bin/pilprint-$(PYVER).py pkg.tmp.autopyc=false +link path=usr/bin/pilprint.py target=pilprint-$(PYVER).py mediator=python \ + mediator-version=$(PYVER) +file path=usr/lib/python$(PYVER)/vendor-packages/PIL.pth +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/64/_imaging.so +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/64/_imagingft.so +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/64/_imagingmath.so +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/64/_imagingtk.so +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ArgImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/BdfFontFile.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/BmpImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/BufrStubImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ContainerIO.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/CurImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/DcxImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/EpsImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ExifTags.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/FitsStubImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/FliImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/FontFile.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/FpxImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/GbrImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/GdImageFile.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/GifImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/GimpGradientFile.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/GimpPaletteFile.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/GribStubImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/Hdf5StubImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/IcnsImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/IcoImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/Image.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageChops.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageCms.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageColor.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageDraw.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageDraw2.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageEnhance.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageFile.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageFileIO.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageFilter.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageFont.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageGL.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageGrab.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageMath.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageMode.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageOps.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImagePalette.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImagePath.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageQt.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageSequence.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageShow.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageStat.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageTk.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageTransform.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImageWin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/ImtImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/IptcImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/JpegImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/McIdasImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/MicImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/MpegImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/MspImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/OleFileIO.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/PIL-1.1.7-py$(PYVER).egg-info +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/PSDraw.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/PaletteFile.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/PalmImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/PcdImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/PcfFontFile.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/PcxImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/PdfImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/PixarImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/PngImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/PpmImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/PsdImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/SgiImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/SpiderImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/SunImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/TarIO.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/TgaImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/TiffImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/TiffTags.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/WalImageFile.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/WmfImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/XVThumbImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/XbmImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/XpmImagePlugin.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imaging.so +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingft.so +file path=usr/lib/python$(PYVER)/vendor-packages/PIL/_imagingmath.so +license imaging.license license="Historical Permission Notice and Disclaimer" + +# python-imaging was previously in the 'desktop' consolidation. This optional +# dependency is here to facilitate the safe transfer of the package +# to the 'userland' consolidation. +depend type=optional \ + fmri=consolidation/desktop/desktop-incorporation@0.5.11,5.11-0.175.2.0.0.20.0 + +# force a dependency on the Python runtime +depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \ + pkg.debug.depend.path=usr/bin + +# force a dependency on the python-imaging package +depend type=require \ + fmri=library/python-2/python-imaging@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) diff -r 6809170bfb95 -r ba566c81fae8 components/python/imaging/imaging.license --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/python/imaging/imaging.license Thu Jul 25 22:11:17 2013 -0700 @@ -0,0 +1,25 @@ +The Python Imaging Library is + +Copyright (c) 1997-2009 by Secret Labs AB +Copyright (c) 1995-2009 by Fredrik Lundh + +By obtaining, using, and/or copying this software and/or its +associated documentation, you agree that you have read, understood, +and will comply with the following terms and conditions: + +Permission to use, copy, modify, and distribute this software and its +associated documentation for any purpose and without fee is hereby +granted, provided that the above copyright notice appears in all +copies, and that both that copyright notice and this permission notice +appear in supporting documentation, and that the name of Secret Labs +AB or the author not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. + +SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR +ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff -r 6809170bfb95 -r ba566c81fae8 components/python/imaging/resolve.deps --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/python/imaging/resolve.deps Thu Jul 25 22:11:17 2013 -0700 @@ -0,0 +1,8 @@ +image/library/libjpeg +library/zlib +runtime/python-26 +runtime/python-27 +runtime/tcl-8 +runtime/tk-8 +system/library +system/library/freetype-2