From 9dfb41d71270c3e0a8302b60c1e7525f39b19288 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Mon, 11 May 2020 23:16:40 +0300 Subject: [PATCH] Rebuild packages for openexr 2.5.0 --- mingw-w64-alembic/PKGBUILD | 7 +++---- mingw-w64-devil/PKGBUILD | 2 +- mingw-w64-freeimage/PKGBUILD | 2 +- mingw-w64-gegl/PKGBUILD | 4 ++-- mingw-w64-gimp/PKGBUILD | 2 +- mingw-w64-gmic/PKGBUILD | 3 +-- mingw-w64-gst-plugins-bad/PKGBUILD | 2 +- mingw-w64-kimageformats-qt5/PKGBUILD | 2 +- .../0015-windres-cant-handle-spaces-in-defines.patch | 11 +++++++++++ mingw-w64-opencv/PKGBUILD | 8 +++++--- 10 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 mingw-w64-opencv/0015-windres-cant-handle-spaces-in-defines.patch diff --git a/mingw-w64-alembic/PKGBUILD b/mingw-w64-alembic/PKGBUILD index 388aac2aab..3fcad80a90 100644 --- a/mingw-w64-alembic/PKGBUILD +++ b/mingw-w64-alembic/PKGBUILD @@ -4,7 +4,7 @@ _realname=alembic pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=1.7.12 -pkgrel=1 +pkgrel=2 pkgdesc="A open framework for storing and sharing scene data (mingw-w64)" arch=('any') url="https://www.alembic.io/" @@ -13,7 +13,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-openexr" "${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-hdf5" "${MINGW_PACKAGE_PREFIX}-zlib") -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-boost") +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-boost") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/alembic/${_realname}/archive/${pkgver}.tar.gz" "0001-alembic-1.7.9-fix-windows-build.patch" "0002-alembic-1.7.9-remove-msc_ver-and-fix-builtins-and-includes.patch") @@ -52,7 +53,6 @@ build() { -DUSE_HDF5=ON \ -DALEMBIC_ILMBASE_LINK_STATIC=OFF \ -DALEMBIC_SHARED_LIBS=0 \ - -DQUIET=ON \ ../${_realname}-${pkgver} make @@ -70,7 +70,6 @@ build() { -DUSE_HDF5=ON \ -DUSE_PYALEMBIC=OFF \ -DALEMBIC_SHARED_LIBS=1 \ - -DQUIET=ON \ ../${_realname}-${pkgver} make diff --git a/mingw-w64-devil/PKGBUILD b/mingw-w64-devil/PKGBUILD index d34686c3a9..e0cf040dd3 100644 --- a/mingw-w64-devil/PKGBUILD +++ b/mingw-w64-devil/PKGBUILD @@ -4,7 +4,7 @@ _realname=DevIL pkgbase=mingw-w64-devil pkgname="${MINGW_PACKAGE_PREFIX}-devil" pkgver=1.8.0 -pkgrel=5 +pkgrel=6 pkgdesc="Library for reading several different image formats (mingw-w64)" arch=('any') url="https://openil.sourceforge.io/" diff --git a/mingw-w64-freeimage/PKGBUILD b/mingw-w64-freeimage/PKGBUILD index ca10e653b0..b33592f3a2 100644 --- a/mingw-w64-freeimage/PKGBUILD +++ b/mingw-w64-freeimage/PKGBUILD @@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=3.18.0 -pkgrel=2 +pkgrel=3 pkgdesc="Library project for developers who would like to support popular graphics image formats (mingw-w64)" arch=('any') license=('GPL' 'custom:FIPL') diff --git a/mingw-w64-gegl/PKGBUILD b/mingw-w64-gegl/PKGBUILD index 221d6ac94f..2552ff0c5f 100644 --- a/mingw-w64-gegl/PKGBUILD +++ b/mingw-w64-gegl/PKGBUILD @@ -5,7 +5,7 @@ _realname=gegl pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.4.22 -pkgrel=1 +pkgrel=2 pkgdesc="Generic Graphics Library (mingw-w64)" arch=('any') url="http://gegl.org/" @@ -46,7 +46,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-babl" optdepends=("${MINGW_PACKAGE_PREFIX}-ffmpeg: for using the ffmpeg plugin") #options=('!strip' 'debug') noextract=("${_realname}-${pkgver}.tar.xz") -source=(https://ftp.gtk.org/pub/gegl/${pkgver%.*}/${_realname}-${pkgver}.tar.xz +source=(https://download.gimp.org/pub/gegl/${pkgver%.*}/${_realname}-${pkgver}.tar.xz "asciidoc-fix-missing-dll.patch") sha256sums=('1888ec41dfd19fe28273795c2209efc1a542be742691561816683990dc642c61' '2c2d800d2f4693e21443a2ba745bb05a23f993886e0d00e0b64fe8c3af1f35d5') diff --git a/mingw-w64-gimp/PKGBUILD b/mingw-w64-gimp/PKGBUILD index 439ec1b4cc..f51ee71438 100644 --- a/mingw-w64-gimp/PKGBUILD +++ b/mingw-w64-gimp/PKGBUILD @@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") _basever=2.10.18 _prever= pkgver=${_basever}${_prever//-/} -pkgrel=5 +pkgrel=6 pkgdesc="GNU Image Manipulation Program (mingw-w64)" arch=('any') url="https://www.gimp.org/" diff --git a/mingw-w64-gmic/PKGBUILD b/mingw-w64-gmic/PKGBUILD index 5bf56c97d7..a7720f0f4f 100644 --- a/mingw-w64-gmic/PKGBUILD +++ b/mingw-w64-gmic/PKGBUILD @@ -4,7 +4,7 @@ _realname=gmic pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="A Full-Featured Open-Source Framework for Image Processing (mingw-w64)" arch=(any) url="https://gmic.eu" @@ -42,7 +42,6 @@ build() { -DCMAKE_BUILD_TYPE=RELEASE \ -DBUILD_LIB=ON \ -DBUILD_LIB_STATIC=OFF \ - -DBUILD_PLUGIN=OFF \ -DBUILD_BASH_COMPLETION=OFF \ -DENABLE_FFMPEG=ON \ -DENABLE_FFTW=ON \ diff --git a/mingw-w64-gst-plugins-bad/PKGBUILD b/mingw-w64-gst-plugins-bad/PKGBUILD index 255db0757f..098b3af1c9 100644 --- a/mingw-w64-gst-plugins-bad/PKGBUILD +++ b/mingw-w64-gst-plugins-bad/PKGBUILD @@ -6,7 +6,7 @@ _realname=gst-plugins-bad pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.16.2 -pkgrel=4 +pkgrel=5 pkgdesc="GStreamer Multimedia Framework Bad Plugins (mingw-w64)" arch=('any') url="https://gstreamer.freedesktop.org/" diff --git a/mingw-w64-kimageformats-qt5/PKGBUILD b/mingw-w64-kimageformats-qt5/PKGBUILD index c7906f3655..1b7f3e4007 100644 --- a/mingw-w64-kimageformats-qt5/PKGBUILD +++ b/mingw-w64-kimageformats-qt5/PKGBUILD @@ -5,7 +5,7 @@ _variant=-${KF5_VARIANT:-shared} source "$(dirname ${BASH_SOURCE[0]})"/../mingw-w64-PKGBUILD-common/kde-frameworks5 _kde_f5_init_package "${_variant}" "kimageformats" pkgver=5.68.0 -pkgrel=1 +pkgrel=2 arch=('any') pkgdesc="Plugins to allow QImage to support extra file formats (mingw-w64-qt5${_namesuff})" license=('LGPL') diff --git a/mingw-w64-opencv/0015-windres-cant-handle-spaces-in-defines.patch b/mingw-w64-opencv/0015-windres-cant-handle-spaces-in-defines.patch new file mode 100644 index 0000000000..e89877fbb7 --- /dev/null +++ b/mingw-w64-opencv/0015-windres-cant-handle-spaces-in-defines.patch @@ -0,0 +1,11 @@ +--- a/modules/core/CMakeLists.txt 2019-12-24 11:16:17.940771900 +0300 ++++ b/modules/core/CMakeLists.txt 2019-12-24 11:14:48.489214700 +0300 +@@ -94,7 +94,7 @@ + endif() + endif() + message(STATUS "Allocator metrics storage type: '${OPENCV_ALLOCATOR_STATS_COUNTER_TYPE}'") +- add_definitions("-DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=${OPENCV_ALLOCATOR_STATS_COUNTER_TYPE}") ++ # add_definitions("-DOPENCV_ALLOCATOR_STATS_COUNTER_TYPE=\"${OPENCV_ALLOCATOR_STATS_COUNTER_TYPE}\"") + endif() + + diff --git a/mingw-w64-opencv/PKGBUILD b/mingw-w64-opencv/PKGBUILD index 5d82e4e6ad..2bbce4047b 100644 --- a/mingw-w64-opencv/PKGBUILD +++ b/mingw-w64-opencv/PKGBUILD @@ -4,7 +4,7 @@ _realname=opencv pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=4.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source Computer Vision Library (mingw-w64)" arch=('any') url="https://opencv.org/" @@ -63,6 +63,7 @@ source=("${_realname}-${pkgver}.tar.gz"::https://github.com/opencv/opencv/archiv '0010-find-libpng-header.patch' '0012-make-header-usable-with-C-compiler.patch' '0014-python-install-path.patch' + '0015-windres-cant-handle-spaces-in-defines.patch' '0101-somehow-uint-not-detected.patch' '0102-mingw-w64-have-sincos.patch' '0103-sfm-module-linking.patch' @@ -78,6 +79,7 @@ sha256sums=('68bc40cbf47fdb8ee73dfaf0d9c6494cd095cf6294d99de445ab64cf853d278a' 'f4d9c95251d74165de89f9c4f17a9a265302aca10ac8723a866f413a2181a361' '7350e41ac9dfd95213b880ff017edda155ad704e35e024cfd9f42d286178b1fb' 'e7ca030c5fc9d1292ff464afe5fd83ebe7d58df98321ed83dc55afba8a60ea3d' + '41355ee1729805557f065de8336c07c5798d6eb3c09456edc837a8b78b11f03a' '7d2ff25f97c84b59793502786dd64e25c8ca991b0523ffea56b45ce031e80c3f' 'ba227bb88c7e6948c54c5a3c8347daf5e2c930e99fb155047015bc5cfa2b33e5' 'd9d4da3c3f0c84b80fd14b882378c79c91435db9e33b9a6199d8eb260ed6eb13' @@ -113,7 +115,8 @@ prepare() { 0009-openblas-find.patch \ 0010-find-libpng-header.patch \ 0012-make-header-usable-with-C-compiler.patch \ - 0014-python-install-path.patch + 0014-python-install-path.patch \ + 0015-windres-cant-handle-spaces-in-defines.patch cd "${srcdir}/${_realname}_contrib-${pkgver}" apply_patch_with_msg \ @@ -131,7 +134,6 @@ build() { CXXFLAGS+=" -D_POSIX_SOURCE -Wno-attributes" export OpenEXR_HOME=${MINGW_PREFIX} - export OPENEXR_ROOT=${MINGW_PREFIX} export OpenBLAS_HOME=${MINGW_PREFIX} export TINYDNN_ROOT=${MINGW_PREFIX}/include/tiny_dnn