pillow, bump version (#4511)

2026-04-21 19:20:08 +02:00 · 2020-01-01 13:11:16 +01:00
parent 4861c8a619
commit 2abd735a75
2 changed files with 85 additions and 120 deletions
--- a/dev-python/pillow/pillow-4.3.0.recipe
+++ b/dev-python/pillow/pillow-4.3.0.recipe
@@ -1,120 +0,0 @@
-SUMMARY="Python Imaging Library (fork)"
-DESCRIPTION="
-	Pillow is the friendly PIL fork by Alex Clark and Contributors.
-	PIL is the Python Imaging Library by Fredrik Lundh and Contributors."
-HOMEPAGE="https://github.com/python-imaging/Pillow
-	https://pypi.python.org/pypi/Pillow"
-COPYRIGHT="1997-2011 by Secret Labs AB
-	1995-2011 by Fredrik Lundh"
-LICENSE="HPND"
-REVISION="1"
-SOURCE_URI="https://files.pythonhosted.org/packages/source/P/Pillow/Pillow-$portVersion.tar.gz"
-CHECKSUM_SHA256="a97c715d44efd5b4aa8d739b8fad88b93ed79f1b33fc2822d5802043f3b1b527"
-SOURCE_DIR="Pillow-$portVersion"
-
-ARCHITECTURES="x86 x86_gcc2 x86_64"
-
-PROVIDES="
-	$portName = $portVersion
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:liblcms2
-	devel:libfreetype
-	devel:libopenjp2
-	devel:libtiff
-	devel:libwebp
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:ld
-	"
-
-PYTHON_PACKAGES=(python python3)
-PYTHON_VERSIONS=(2.7 3.6)
-for i in "${!PYTHON_PACKAGES[@]}"; do
-pythonPackage=${PYTHON_PACKAGES[i]}
-pythonVersion=${PYTHON_VERSIONS[$i]}
-eval "PROVIDES_${pythonPackage}=\"\
-	${portName}_$pythonPackage = $portVersion\
-	\"; \
-REQUIRES_$pythonPackage=\"\
-	haiku\n\
-	cmd:python$pythonVersion\n\
-	lib:liblcms2\n\
-	lib:libfreetype\n\
-	lib:libjpeg\n\
-	lib:libopenjp2\n\
-	lib:libtiff\n\
-	lib:libwebp\n\
-	lib:libz\n\
-	\""
-BUILD_REQUIRES="$BUILD_REQUIRES
-	setuptools_$pythonPackage"
-BUILD_PREREQUIRES="$BUILD_PREREQUIRES
-	cmd:python$pythonVersion"
-done
-
-PROVIDES_python="$PROVIDES_python
-	cmd:createfontdatachunk.py = $portVersion
-	cmd:enhancer.py = $portVersion
-	cmd:explode.py = $portVersion
-	cmd:gifmaker.py = $portVersion
-	cmd:painter.py = $portVersion
-	cmd:pilconvert.py = $portVersion
-	cmd:pildriver.py = $portVersion
-	cmd:pilfile.py = $portVersion
-	cmd:pilfont.py = $portVersion
-	cmd:pilprint.py = $portVersion
-	cmd:player.py = $portVersion
-	cmd:thresholder.py = $portVersion
-	cmd:viewer.py = $portVersion
-	"
-PROVIDES_python3="$PROVIDES_python3
-	cmd:createfontdatachunk3.py = $portVersion
-	cmd:enhancer3.py = $portVersion
-	cmd:explode3.py = $portVersion
-	cmd:gifmaker3.py = $portVersion
-	cmd:painter3.py = $portVersion
-	cmd:pilconvert3.py = $portVersion
-	cmd:pildriver3.py = $portVersion
-	cmd:pilfile3.py = $portVersion
-	cmd:pilfont3.py = $portVersion
-	cmd:pilprint3.py = $portVersion
-	cmd:player3.py = $portVersion
-	cmd:thresholder3.py = $portVersion
-	cmd:viewer3.py = $portVersion
-	"
-
-INSTALL()
-{
-	export INCLUDE="$(findpaths -c: B_FIND_PATH_HEADERS_DIRECTORY)"
-	export LIB="$(findpaths -c: B_FIND_PATH_DEVELOP_LIB_DIRECTORY)"
-	for i in "${!PYTHON_PACKAGES[@]}"; do
-		pythonPackage=${PYTHON_PACKAGES[i]}
-		pythonVersion=${PYTHON_VERSIONS[$i]}
-
-		python=python$pythonVersion
-		installLocation=$prefix/lib/$python/vendor-packages/
-		export PYTHONPATH=$installLocation:$PYTHONPATH
-		mkdir -p $installLocation
-		rm -rf build
-		$python setup.py build install \
-			--root=/ --prefix=$prefix
-
-		if [ $pythonPackage != python ]; then
-			for f in $binDir/*.py; do
-				mv $f ${f%.py}3.py
-			done
-		fi
-
-		packageEntries  $pythonPackage \
-			$prefix/lib/python* \
-			$binDir
-	done
-}
--- a/dev-python/pillow/pillow-6.2.1.recipe
+++ b/dev-python/pillow/pillow-6.2.1.recipe
@@ -0,0 +1,85 @@
+SUMMARY="Python Imaging Library (fork)"
+DESCRIPTION="Pillow is the friendly PIL fork by Alex Clark and Contributors.
+PIL is the Python Imaging Library by Fredrik Lundh and Contributors."
+HOMEPAGE="https://github.com/python-imaging/Pillow
+	https://pypi.python.org/pypi/Pillow"
+COPYRIGHT="1997-2011 by Secret Labs AB
+	1995-2011 by Fredrik Lundh"
+LICENSE="HPND"
+REVISION="1"
+SOURCE_URI="https://github.com/python-pillow/Pillow/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="7bf2d6bdb68fa6ccec15c0fd9aa20fac9641cd20dc6079344f5a6534e13a70f9"
+SOURCE_FILENAME="pillow-$portVersion.tar.gz"
+SOURCE_DIR="Pillow-$portVersion"
+
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	$portName = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:liblcms2$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libopenjp2$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
+	devel:libwebp$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+PYTHON_PACKAGES=(python python36 python3)
+PYTHON_VERSIONS=(2.7 3.6 3.7)
+for i in "${!PYTHON_PACKAGES[@]}"; do
+pythonPackage=${PYTHON_PACKAGES[i]}
+pythonVersion=${PYTHON_VERSIONS[$i]}
+eval "PROVIDES_${pythonPackage}=\"\
+	${portName}_$pythonPackage = $portVersion\
+	\"; \
+REQUIRES_$pythonPackage=\"\
+	haiku${secondaryArchSuffix}\n\
+	cmd:python$pythonVersion\n\
+	lib:liblcms2$secondaryArchSuffix\n\
+	lib:libfreetype$secondaryArchSuffix\n\
+	lib:libjpeg$secondaryArchSuffix\n\
+	lib:libopenjp2$secondaryArchSuffix\n\
+	lib:libtiff$secondaryArchSuffix\n\
+	lib:libwebp$secondaryArchSuffix\n\
+	lib:libz$secondaryArchSuffix\n\
+	\""
+BUILD_REQUIRES="$BUILD_REQUIRES
+	setuptools_$pythonPackage"
+BUILD_PREREQUIRES="$BUILD_PREREQUIRES
+	cmd:python$pythonVersion"
+done
+
+INSTALL()
+{
+	export INCLUDE="$(findpaths -c: B_FIND_PATH_HEADERS_DIRECTORY)"
+	export LIB="$(findpaths -c: B_FIND_PATH_DEVELOP_LIB_DIRECTORY)"
+	for i in "${!PYTHON_PACKAGES[@]}"; do
+		pythonPackage=${PYTHON_PACKAGES[i]}
+		pythonVersion=${PYTHON_VERSIONS[$i]}
+
+		python=python$pythonVersion
+		installLocation=$prefix/lib/$python/vendor-packages/
+		export PYTHONPATH=$installLocation:$PYTHONPATH
+		mkdir -p $installLocation
+		rm -rf build
+		$python setup.py build install \
+			--root=/ --prefix=$prefix
+
+		packageEntries  $pythonPackage \
+			$prefix/lib/python*
+	done
+}