diff --git a/mingw-w64-openexr/0013-no-py2.patch b/mingw-w64-openexr/0013-no-py2.patch new file mode 100644 index 0000000000..56bb3fcc36 --- /dev/null +++ b/mingw-w64-openexr/0013-no-py2.patch @@ -0,0 +1,11 @@ +--- openexr-2.4.0/PyIlmBase/CMakeLists.txt.orig 2019-09-18 03:02:06.000000000 +0200 ++++ openexr-2.4.0/PyIlmBase/CMakeLists.txt 2019-12-08 14:03:14.054387900 +0100 +@@ -38,7 +38,7 @@ + endif() + + # now determine which (or both), and compile for both +-find_package(Python2 COMPONENTS Interpreter Development) ++#find_package(Python2 COMPONENTS Interpreter Development) + find_package(Python3 COMPONENTS Interpreter Development) + if(TARGET Python2::Python AND TARGET Python3::Python) + message(NOTICE ": Found Python ${Python2_VERSION} and ${Python3_VERSION}") diff --git a/mingw-w64-openexr/PKGBUILD b/mingw-w64-openexr/PKGBUILD index ad6a0da242..f6b08e0b70 100644 --- a/mingw-w64-openexr/PKGBUILD +++ b/mingw-w64-openexr/PKGBUILD @@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-ilmbase" "${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-pyilmbase") pkgver=2.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Openexr library for EXR images (mingw-w64)" arch=('any') url="https://www.openexr.com/" @@ -17,9 +17,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-python3" - "${MINGW_PACKAGE_PREFIX}-python3-numpy" - "${MINGW_PACKAGE_PREFIX}-python2" - "${MINGW_PACKAGE_PREFIX}-python2-numpy") + "${MINGW_PACKAGE_PREFIX}-python3-numpy") options=('staticlibs' 'strip') source=(${_realname}-${pkgver}.tar.gz::https://github.com/openexr/openexr/archive/v${pkgver}.tar.gz 0001-mingw-w64-fix.patch @@ -28,7 +26,8 @@ source=(${_realname}-${pkgver}.tar.gz::https://github.com/openexr/openexr/archiv 0006-cmake-soversion.patch 0009-win-dwalookups.patch 0010-link-python-with-boost.patch - 0012-exports.patch) + 0012-exports.patch + 0013-no-py2.patch) sha256sums=('4904c5ea7914a58f60a5e2fbc397be67e7a25c380d7d07c1c31a3eefff1c92f1' '68bedb3a4acc6f62b1486c7c47c9025f5ce4131468e17445f0c716545ddd00c1' '460dcfd86b407241382ed4ba5a003ae251c9fdce68e7cfdea021b09898ad2705' @@ -36,7 +35,8 @@ sha256sums=('4904c5ea7914a58f60a5e2fbc397be67e7a25c380d7d07c1c31a3eefff1c92f1' '313b0c98abdd792b8213ec9685a5a7b095ec69faa528f6fd0946f23576b6ef07' '2ca841425ae676f75fa714a16f0124272224147fe40ea507ccc4bf74477f51ab' '3751c86a8df4479e16bac197c86fefe7049d580275b405e4a3540844781a3db8' - '895c2b57b3061b09b97f82b0c41a5f87ca0fb56f53c7b849b6de2623756d232c') + '895c2b57b3061b09b97f82b0c41a5f87ca0fb56f53c7b849b6de2623756d232c' + '47e4e068439a1adaca41d7d7f966f65f1ae68b4dee1d1dd7c5778256edc3b3e8') prepare(){ cd "${srcdir}/${_realname}-${pkgver}" @@ -51,6 +51,7 @@ prepare(){ patch -p1 -i ${srcdir}/0009-win-dwalookups.patch patch -p1 -i ${srcdir}/0010-link-python-with-boost.patch patch -p1 -i ${srcdir}/0012-exports.patch + patch -p1 -i ${srcdir}/0013-no-py2.patch } build() { @@ -96,18 +97,14 @@ package_pyilmbase() { pkgdesc="Python2 bindings for OpenEXR library (mingw-w64)" depends=("${MINGW_PACKAGE_PREFIX}-openexr=${pkgver}" "${MINGW_PACKAGE_PREFIX}-boost" - "${MINGW_PACKAGE_PREFIX}-python2-numpy") + "${MINGW_PACKAGE_PREFIX}-python3-numpy") cd "${srcdir}/build-${MINGW_CHOST}/PyIlmBase" make DESTDIR=${pkgdir} install # Install python modules - local _py2ver=$(${MINGW_PREFIX}/bin/python2 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") local _py3ver=$(${MINGW_PREFIX}/bin/python3 -c "import sys;sys.stdout.write('.'.join(map(str, sys.version_info[:2])))") - - mkdir -p ${pkgdir}${MINGW_PREFIX}/lib/python${_py2ver}/site-packages - cp ${srcdir}/build-${MINGW_CHOST}/python${_py2ver//./_}/*.pyd ${pkgdir}${MINGW_PREFIX}/lib/python${_py2ver}/site-packages/ - + mkdir -p ${pkgdir}${MINGW_PREFIX}/lib/python${_py3ver}/site-packages cp ${srcdir}/build-${MINGW_CHOST}/python${_py3ver//./_}/*.pyd ${pkgdir}${MINGW_PREFIX}/lib/python${_py3ver}/site-packages/ }