From df9903f470f3af69de155504afed9bf69f790b08 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 27 Feb 2021 19:22:19 +0100 Subject: [PATCH 1/8] ImageMagick: update to 7.0.11.1. --- common/shlibs | 6 +++--- srcpkgs/ImageMagick/template | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index b016d28f788..dd1c3acd0c9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -335,9 +335,9 @@ liblcms.so.1 lcms-1.18_1 libgd.so.3 gd-2.1.0_1 libcroco-0.6.so.3 libcroco-0.6.2_1 libgsf-1.so.114 libgsf-1.14.11_1 -libMagickCore-7.Q16HDRI.so.8 libmagick-7.0.10.37_1 -libMagickWand-7.Q16HDRI.so.8 libmagick-7.0.10.37_1 -libMagick++-7.Q16HDRI.so.4 libmagick-7.0.9.1_1 +libMagickCore-7.Q16HDRI.so.9 libmagick-7.0.11.1_1 +libMagickWand-7.Q16HDRI.so.9 libmagick-7.0.11.1_1 +libMagick++-7.Q16HDRI.so.5 libmagick-7.0.11.1_1 libMagickCore-6.Q16.so.7 libmagick6-6.9.11.61_1 libMagickWand-6.Q16.so.7 libmagick6-6.9.11.61_1 libMagick++-6.Q16.so.8 libmagick6-6.9.10.11_1 diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index 17e59755740..2e59b3052ea 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -1,7 +1,7 @@ # Template file for 'ImageMagick' pkgname=ImageMagick -_majorver=7.0.10 -_patchver=60 +_majorver=7.0.11 +_patchver=1 version="${_majorver}.${_patchver}" revision=1 wrksrc="${pkgname}-${_majorver}-${_patchver}" @@ -21,7 +21,7 @@ license="ImageMagick" homepage="https://www.imagemagick.org/" changelog="https://imagemagick.org/script/changelog.php" distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz" -checksum=044fc1b27bd9aab515d4c512a33cf3a39313af2baef4aebf5c5c3044b7366ee4 +checksum=c04992429200d1168d6f45e2615e8ad6939dddb8f7559ebda669bcac66bc3165 subpackages="libmagick libmagick-devel" From cdac1c46dca966964c40588cc4b6ccb9a9e7aeaa Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 27 Feb 2021 19:24:23 +0100 Subject: [PATCH 2/8] chafa: rebuild for ImageMagick-7.0.11.1 --- srcpkgs/chafa/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template index 6153df30ecb..1b07026b9ea 100644 --- a/srcpkgs/chafa/template +++ b/srcpkgs/chafa/template @@ -1,7 +1,7 @@ # Template file for 'chafa' pkgname=chafa version=1.6.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libglib-devel libmagick-devel libXext-devel libxml2-devel" From e39812a8e329d2423e816156bc5a7d62a631ce84 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 27 Feb 2021 19:24:24 +0100 Subject: [PATCH 3/8] dmtx-utils: rebuild for ImageMagick-7.0.11.1 --- srcpkgs/dmtx-utils/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dmtx-utils/template b/srcpkgs/dmtx-utils/template index 470f72df0f4..b251f0a2061 100644 --- a/srcpkgs/dmtx-utils/template +++ b/srcpkgs/dmtx-utils/template @@ -1,7 +1,7 @@ # Template file for 'dmtx-utils' pkgname=dmtx-utils version=0.7.6 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="libdmtx-devel libmagick-devel libXext-devel libxml2-devel" From 273ec6dfab90e6839bbc02e40b22efbb550decfa Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 27 Feb 2021 19:24:24 +0100 Subject: [PATCH 4/8] libopenshot: rebuild for ImageMagick-7.0.11.1 --- srcpkgs/libopenshot/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template index 1c602b3386a..7a3a5a2cfd9 100644 --- a/srcpkgs/libopenshot/template +++ b/srcpkgs/libopenshot/template @@ -1,7 +1,7 @@ # Template file for 'libopenshot' pkgname=libopenshot version=0.2.5 -revision=3 +revision=4 archs="i686 x86_64 ppc64le" build_style=cmake configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" # Builds fail with Ruby-2.4.1 @@ -17,6 +17,8 @@ homepage="https://github.com/OpenShot/libopenshot" distfiles="https://github.com/OpenShot/libopenshot/archive/v${version}.tar.gz" checksum=8ae7d226fbd2efbc84da4f7d9d8c7f3cc9616e4de46e1233e3b0a84ac0a429bc patch_args="-Np1" +# FIXME: tests segfault +make_check=extended libopenshot-devel_package() { short_desc+=" - development files" From 3d4d035499bb9f91b15a644f9f533b4b5a7788cf Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 27 Feb 2021 19:24:24 +0100 Subject: [PATCH 5/8] php-imagick: rebuild for ImageMagick-7.0.11.1 --- srcpkgs/php-imagick/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/php-imagick/template b/srcpkgs/php-imagick/template index d23bd8e86cf..dba22bb860c 100644 --- a/srcpkgs/php-imagick/template +++ b/srcpkgs/php-imagick/template @@ -1,7 +1,7 @@ # Template file for 'php-imagick' pkgname=php-imagick version=3.4.4 -revision=2 +revision=3 wrksrc="imagick-$version" build_style=gnu-configure hostmakedepends="php-devel autoconf pkg-config" From cb7c0e7eef0614324be3386e13186e9ca07db536 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 27 Feb 2021 19:24:24 +0100 Subject: [PATCH 6/8] sk1: rebuild for ImageMagick-7.0.11.1 --- srcpkgs/sk1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sk1/template b/srcpkgs/sk1/template index cccedeba0d9..18804e74fc3 100644 --- a/srcpkgs/sk1/template +++ b/srcpkgs/sk1/template @@ -1,7 +1,7 @@ # Template file for 'sk1' pkgname=sk1 version=2.0rc4 -revision=3 +revision=4 build_style=python2-module pycompile_dirs="/usr/lib/sk1-wx-${version}" hostmakedepends="pkg-config python" @@ -14,7 +14,7 @@ license="GPL-3.0-or-later" homepage="https://sk1project.net" distfiles="https://downloads.sk1project.net/sk1/${version}/sk1-${version}.tar.gz" checksum=65ef0856389d3972e758d55eea33357a4bccec8b97d95eb8dc6be186a7956063 -python_version=2 #unverified +python_version=2 pre_configure() { # python2: can't open file 'setup.py': [Errno 2] No such file or directory From c18e8fe8ff39a67ff915cb1803fa4416a64a6e60 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 27 Feb 2021 19:24:24 +0100 Subject: [PATCH 7/8] vapoursynth: rebuild for ImageMagick-7.0.11.1 --- srcpkgs/vapoursynth/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template index da9181e67ce..8508ca67110 100644 --- a/srcpkgs/vapoursynth/template +++ b/srcpkgs/vapoursynth/template @@ -1,7 +1,7 @@ # Template file for 'vapoursynth' pkgname=vapoursynth version=R52 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool nasm pkg-config python3-Cython" makedepends="ffmpeg-devel python3-devel zimg-devel libass-devel libmagick-devel From fbda8e2dd32b1ef8f7983e63a726268885fb3333 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 27 Feb 2021 19:24:25 +0100 Subject: [PATCH 8/8] zbar: rebuild for ImageMagick-7.0.11.1 --- srcpkgs/zbar/template | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template index be74e55f0d9..0af45329940 100644 --- a/srcpkgs/zbar/template +++ b/srcpkgs/zbar/template @@ -1,7 +1,7 @@ # Template file for 'zbar' pkgname=zbar version=0.23.1 -revision=2 +revision=3 build_style=gnu-configure build_helper=gir configure_args="$(vopt_with qt) --with-gir --with-python=python3" @@ -23,6 +23,12 @@ case "$XBPS_TARGET_MACHINE" in *) build_options_default="qt" ;; esac +case "$XBPS_TARGET_MACHINE" in + *-musl) makedepends+=" argp-standalone" + LDFLAGS="-largp" + ;; +esac + export PYTHON_CFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver" CFLAGS="-DNDEBUG"