summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2021-02-21 21:52:44 +0000
committerDaniel Bermond2021-02-21 21:52:44 +0000
commit121121d0610d4f560324012569e1639bfc9b17e2 (patch)
tree92eaaa70c606ab7e5d2727b650e363bd35385f33
parent856265dc35b626ed1944f6df68a53b9279093e5a (diff)
downloadaur-121121d0610d4f560324012569e1639bfc9b17e2.tar.gz
Bring back jpeg-xl (fixed upstream). Add dmalloc.
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD9
2 files changed, 12 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4cbe24008a8c..e8f62efc020e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = imagemagick-full-git
pkgdesc = An image viewing/manipulation program (Q32 HDRI with all features, git version)
- pkgver = 7.0.10.62.r23.g923b9c180
+ pkgver = 7.0.11.1.r2.g1e7d30de2
pkgrel = 1
url = https://www.imagemagick.org/
arch = x86_64
@@ -52,8 +52,10 @@ pkgbase = imagemagick-full-git
makedepends = perl
makedepends = libzip
makedepends = autotrace-nomagick
+ makedepends = dmalloc
makedepends = flif
makedepends = libfpx
+ makedepends = libjpeg-xl
makedepends = libumem-git
source = git+https://github.com/ImageMagick/ImageMagick.git#branch=main
source = arch-fonts.diff
@@ -97,11 +99,13 @@ pkgname = imagemagick-full-git
depends = ttf-dejavu
depends = perl
depends = autotrace-nomagick
+ depends = dmalloc
depends = flif
depends = libfpx
+ depends = libjpeg-xl
depends = libumem-git
optdepends = imagemagick-full-doc-git: manual and API docs
- provides = imagemagick=7.0.10.62.r23.g923b9c180
+ provides = imagemagick=7.0.11.1.r2.g1e7d30de2
provides = imagemagick-git
provides = libmagick
provides = libmagick-git
@@ -126,6 +130,6 @@ pkgname = imagemagick-full-git
pkgname = imagemagick-full-doc-git
pkgdesc = An image viewing/manipulation program (Q32 HDRI with all features, git version) (manual and API docs)
arch = any
- provides = imagemagick-doc=7.0.10.62.r23.g923b9c180
+ provides = imagemagick-doc=7.0.11.1.r2.g1e7d30de2
conflicts = imagemagick-doc
diff --git a/PKGBUILD b/PKGBUILD
index d65c566891d6..60e2dec056bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
pkgbase=imagemagick-full-git
pkgname=('imagemagick-full-git' 'imagemagick-full-doc-git')
-pkgver=7.0.10.62.r23.g923b9c180
+pkgver=7.0.11.1.r2.g1e7d30de2
pkgrel=1
arch=('x86_64')
_qdepth='32'
@@ -30,7 +30,7 @@ makedepends=(
'cairo' 'libpng' 'ghostscript' 'ming' 'librsvg' 'libtiff' 'libwebp' 'libwmf'
'ocl-icd' 'gsfonts' 'ttf-dejavu' 'perl' 'libzip'
# AUR:
- 'autotrace-nomagick' 'flif' 'libfpx' 'libumem-git'
+ 'autotrace-nomagick' 'dmalloc' 'flif' 'libfpx' 'libjpeg-xl' 'libumem-git'
)
source=('git+https://github.com/ImageMagick/ImageMagick.git#branch=main'
'arch-fonts.diff')
@@ -61,6 +61,7 @@ build() {
--enable-cipher \
--enable-hdri \
--enable-docs \
+ --with-dmalloc \
--with-threads \
--with-modules \
--with-quantum-depth="${_qdepth}" \
@@ -88,7 +89,7 @@ build() {
--with-heic \
--with-jbig \
--with-jpeg \
- --without-jxl \
+ --with-jxl \
--with-lcms \
--with-openjp2 \
--with-lqr \
@@ -129,7 +130,7 @@ package_imagemagick-full-git() {
'cairo' 'libpng' 'ghostscript' 'ming' 'librsvg' 'libtiff' 'libwebp' 'libwmf'
'ocl-icd' 'gsfonts' 'ttf-dejavu' 'perl'
# AUR:
- 'autotrace-nomagick' 'flif' 'libfpx' 'libumem-git'
+ 'autotrace-nomagick' 'dmalloc' 'flif' 'libfpx' 'libjpeg-xl' 'libumem-git'
)
optdepends=('imagemagick-full-doc-git: manual and API docs')
backup=("etc/ImageMagick-${pkgver%%.*}"/{colors,delegates,log,mime,policy,quantization-table,thresholds,type{,-dejavu,-ghostscript}}.xml)