From 92d82999693cc7e09268fd71ca98caeaaf39ce30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= Date: Thu, 15 Jul 2021 18:16:34 +0200 Subject: [PATCH 1/9] ImageMagick: update to 7.1.0.4 (with soname bump) - Remove unnecessary configure options - Add support for graphviz, jbig, lqr and raqm --- common/shlibs | 4 ++-- srcpkgs/ImageMagick/template | 34 +++++++++++++++------------------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/common/shlibs b/common/shlibs index d3e078140f7b..e836037e840a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -333,8 +333,8 @@ 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.9 libmagick-7.0.11.1_1 -libMagickWand-7.Q16HDRI.so.9 libmagick-7.0.11.1_1 +libMagickCore-7.Q16HDRI.so.10 libmagick-7.1.0.2_1 +libMagickWand-7.Q16HDRI.so.10 libmagick-7.1.0.2_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 diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index 1703283ee7d2..45faece2d66c 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -1,28 +1,26 @@ # Template file for 'ImageMagick' pkgname=ImageMagick -version=7.0.11.12 -revision=3 +version=7.1.0.4 +revision=1 _majorver=${version%.*} _patchver=${version##*.} wrksrc="${pkgname}-${_majorver}-${_patchver}" build_style=gnu-configure -configure_args="--without-autotrace --with-wmf=yes - --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes - --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1 - --with-magick-plus-plus --with-modules --enable-shared --with-rsvg - --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static - --with-openjp2" +configure_args="--disable-static --enable-opencl --with-modules --with-gslib + --with-rsvg --with-wmf --with-dejavu-font-dir=/usr/share/fonts/TTF + --with-gs-font-dir=/usr/share/fonts/Type1" hostmakedepends="automake libtool pkg-config autoconf" -makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel - libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel libwmf-devel - ocl-icd-devel pango-devel libopenjpeg2-devel" -short_desc="Package for display and interactive manipulation of images" +makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel + graphviz-devel lcms2-devel libXt-devel libgomp-devel liblqr-devel libltdl-devel + libopenjpeg2-devel libraqm-devel librsvg-devel libwebp-devel libwmf-devel + ocl-icd-devel pango-devel" +short_desc="Create, edit, compose, or convert bitmap images" maintainer="Orphaned " license="ImageMagick" -homepage="https://www.imagemagick.org/" +homepage="https://www.imagemagick.org" changelog="https://imagemagick.org/script/changelog.php" -distfiles="https://github.com/ImageMagick/ImageMagick/archive/${_majorver}-${_patchver}.tar.gz" -checksum=b4054e9f6b6692791f37fe6f2ab5819152210e6628e69a8dbd66a41320c3c9d3 +distfiles="https://download.imagemagick.org/ImageMagick/download/ImageMagick-${_majorver}-${_patchver}.tar.xz" +checksum=1a54bd46947f16fb29cf083be3614a14135f2fe9d1aa20665a85a8940bf6dc65 subpackages="libmagick libmagick-devel" @@ -66,10 +64,8 @@ libmagick_package() { } libmagick-devel_package() { - depends=" - fftw-devel fontconfig-devel lcms2-devel libXt-devel - libgomp-devel libltdl-devel - libmagick>=${version}_${revision}" + depends="libmagick>=${version}_${revision} fontconfig-devel lcms2-devel + libXt-devel libgomp-devel liblqr-devel libltdl-devel libraqm-devel" short_desc="ImageMagick low-level image manipulation development files" pkg_install() { vmove usr/include From db8b9b5eed21e7a349c1e6a51469f87479666b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= Date: Thu, 15 Jul 2021 18:32:20 +0200 Subject: [PATCH 2/9] Converseen: rebuild against libmagick-7.1.0.4 --- srcpkgs/Converseen/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Converseen/template b/srcpkgs/Converseen/template index 7117f14e87a9..8daaa56ac67d 100644 --- a/srcpkgs/Converseen/template +++ b/srcpkgs/Converseen/template @@ -1,7 +1,7 @@ # Template file for 'Converseen' pkgname=Converseen version=0.9.9.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" makedepends="qt5-devel qt5-tools-devel libmagick-devel ImageMagick" From c61b0e137eeaa483899cff0ef33c2c84b64833c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= Date: Thu, 15 Jul 2021 18:32:20 +0200 Subject: [PATCH 3/9] libopenshot: rebuild against libmagick-7.1.0.4 --- srcpkgs/libopenshot/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template index 595ff6f7edcc..b9996036b6ed 100644 --- a/srcpkgs/libopenshot/template +++ b/srcpkgs/libopenshot/template @@ -1,7 +1,7 @@ # Template file for 'libopenshot' pkgname=libopenshot version=0.2.5 -revision=4 +revision=5 archs="i686 x86_64 ppc64le" build_style=cmake configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" # Builds fail with Ruby-2.4.1 From 09bd33f6baff4ed8789a40175c36ff7ac1dabbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= Date: Thu, 15 Jul 2021 18:32:21 +0200 Subject: [PATCH 4/9] php-imagick: rebuild against libmagick-7.1.0.4 --- 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 dba22bb860cd..f995e35f59e3 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=3 +revision=4 wrksrc="imagick-$version" build_style=gnu-configure hostmakedepends="php-devel autoconf pkg-config" From a837740b7f0a030bf4ccc4ac91dfe5e25f8d8430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= Date: Thu, 15 Jul 2021 18:32:21 +0200 Subject: [PATCH 5/9] sk1: rebuild against libmagick-7.1.0.4 --- srcpkgs/sk1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sk1/template b/srcpkgs/sk1/template index 18804e74fc39..2af81ff8b76a 100644 --- a/srcpkgs/sk1/template +++ b/srcpkgs/sk1/template @@ -1,7 +1,7 @@ # Template file for 'sk1' pkgname=sk1 version=2.0rc4 -revision=4 +revision=5 build_style=python2-module pycompile_dirs="/usr/lib/sk1-wx-${version}" hostmakedepends="pkg-config python" From 02e7344167bc9db3c25fdfa0b20f1dec28ffaef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= Date: Thu, 15 Jul 2021 18:32:21 +0200 Subject: [PATCH 6/9] vapoursynth: rebuild against libmagick-7.1.0.4 --- srcpkgs/vapoursynth/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template index 8508ca671104..f5c2ff555563 100644 --- a/srcpkgs/vapoursynth/template +++ b/srcpkgs/vapoursynth/template @@ -1,7 +1,7 @@ # Template file for 'vapoursynth' pkgname=vapoursynth version=R52 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool nasm pkg-config python3-Cython" makedepends="ffmpeg-devel python3-devel zimg-devel libass-devel libmagick-devel From b27012fd4363e26ee175a7d10d75d71497511226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= Date: Thu, 15 Jul 2021 18:43:53 +0200 Subject: [PATCH 7/9] chafa: rebuild against libmagick-7.1.0.4 --- srcpkgs/chafa/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template index 1b07026b9ea4..c6250d45d83a 100644 --- a/srcpkgs/chafa/template +++ b/srcpkgs/chafa/template @@ -1,7 +1,7 @@ # Template file for 'chafa' pkgname=chafa version=1.6.0 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libglib-devel libmagick-devel libXext-devel libxml2-devel" From da36014ed5b1c007d31df4b3f4f15a2e656b44cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= Date: Thu, 15 Jul 2021 18:43:53 +0200 Subject: [PATCH 8/9] dmtx-utils: rebuild against libmagick-7.1.0.4 --- 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 b251f0a2061b..c00404c8b4c3 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=4 +revision=5 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="libdmtx-devel libmagick-devel libXext-devel libxml2-devel" From 72ea07973d4d582079720d76a8b5a5f78856671e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Kr=C3=A4mer?= Date: Thu, 15 Jul 2021 18:43:54 +0200 Subject: [PATCH 9/9] zbar: rebuild against libmagick-7.1.0.4 --- srcpkgs/zbar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template index f64d87fcfe81..139f17f4ec52 100644 --- a/srcpkgs/zbar/template +++ b/srcpkgs/zbar/template @@ -1,7 +1,7 @@ # Template file for 'zbar' pkgname=zbar version=0.23.1 -revision=3 +revision=4 build_style=gnu-configure build_helper=gir configure_args="$(vopt_with qt) --with-gir --with-python=python3"