summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wagie2021-10-07 13:41:50 -0600
committerMark Wagie2021-10-07 13:41:50 -0600
commitdc045f4aab250fc3deeab9681439b28b63172164 (patch)
tree2149b0d05736938eb7c910a544f4d26aae10c2ac
parent560567cdb212f0217fa1b4634abed1953baf1aa2 (diff)
downloadaur-dc045f4aab250fc3deeab9681439b28b63172164.tar.gz
Enable JPEG XL & DJVU
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD20
2 files changed, 22 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6d0d1f5e96a2..3cdc5e0c0ac5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = imagemagick6
pkgdesc = An image viewing/manipulation program (legacy 6.9.12-* series)
pkgver = 6.9.12.25
- pkgrel = 1
+ pkgrel = 2
url = https://legacy.imagemagick.org/
arch = x86_64
license = custom
@@ -17,6 +17,7 @@ pkgbase = imagemagick6
makedepends = opencl-headers
makedepends = libwebp
makedepends = libzip
+ makedepends = libjxl
makedepends = chrpath
makedepends = ocl-icd
makedepends = glu
@@ -24,6 +25,12 @@ pkgbase = imagemagick6
makedepends = ghostxps
makedepends = libheif
makedepends = jbigkit
+ makedepends = lcms2
+ makedepends = libxext
+ makedepends = liblqr
+ makedepends = libraqm
+ makedepends = libpng
+ makedepends = djvulibre
depends = libltdl
depends = lcms2
depends = fontconfig
@@ -31,6 +38,7 @@ pkgbase = imagemagick6
depends = liblqr
depends = libraqm
depends = libpng
+ depends = libxml2
source = ImageMagick6-6.9.12-25.tar.gz::https://github.com/ImageMagick/ImageMagick6/archive/refs/tags/6.9.12-25.tar.gz
source = arch-fonts.diff
sha256sums = a6de8acc96c48a3934b1389f051efbacc1536900362c22ad0c23d8756deaae9a
@@ -40,6 +48,7 @@ pkgname = libmagick6
pkgdesc = An image viewing/manipulation program (legacy 6.9.12-* series; library)
optdepends = ghostscript: PS/PDF support
optdepends = libheif: HEIF support
+ optdepends = libjxl: JPEG XL support
optdepends = libraw: DNG support
optdepends = librsvg: SVG support
optdepends = libwebp: WEBP support
@@ -48,8 +57,8 @@ pkgname = libmagick6
optdepends = ocl-icd: OpenCL support
optdepends = openexr: OpenEXR support
optdepends = openjpeg2: JPEG2000 support
+ optdepends = djvulibre: DJVU support
optdepends = pango: Text rendering
- options = !docs
options = !emptydirs
options = libtool
backup = etc/ImageMagick-6/coder.xml
diff --git a/PKGBUILD b/PKGBUILD
index bd3fee92a72b..1b7059fed284 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,15 +7,14 @@ pkgname=libmagick6
pkgbase=imagemagick6
_pkgver=6.9.12-25
pkgver=${_pkgver//-/.}
-pkgrel=1
+pkgrel=2
pkgdesc="An image viewing/manipulation program (legacy 6.9.12-* series)"
url="https://legacy.imagemagick.org/"
arch=('x86_64')
license=('custom')
-depends=('libltdl' 'lcms2' 'fontconfig' 'libxext' 'liblqr' 'libraqm' 'libpng')
-makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'openjpeg2'
- 'libraw' 'opencl-headers' 'libwebp' 'libzip' 'chrpath' 'ocl-icd'
- 'glu' 'ghostpcl' 'ghostxps' 'libheif' 'jbigkit')
+depends=('libltdl' 'lcms2' 'fontconfig' 'libxext' 'liblqr' 'libraqm' 'libpng' 'libxml2')
+makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'openjpeg2' 'libraw' 'opencl-headers' 'libwebp' 'libzip' 'libjxl'
+ 'chrpath' 'ocl-icd' 'glu' 'ghostpcl' 'ghostxps' 'libheif' 'jbigkit' 'lcms2' 'libxext' 'liblqr' 'libraqm' 'libpng' 'djvulibre')
checkdepends=('gsfonts' 'ttf-dejavu')
source=("ImageMagick6-$_pkgver.tar.gz::https://github.com/ImageMagick/ImageMagick6/archive/refs/tags/$_pkgver.tar.gz"
'arch-fonts.diff')
@@ -29,8 +28,6 @@ prepare() {
# Fix up typemaps to match our packages, where possible
patch -Np1 -i ../arch-fonts.diff
-
- # Don't run auto(re)conf; assumes use of git
}
build() {
@@ -40,6 +37,8 @@ build() {
--prefix=/usr \
--sysconfdir=/etc \
--enable-shared \
+ --disable-static \
+ --disable-docs \
--with-dejavu-font-dir=/usr/share/fonts/TTF \
--with-gs-font-dir=/usr/share/fonts/gsfonts \
PSDelegate=/usr/bin/gs \
@@ -48,6 +47,8 @@ build() {
--enable-hdri \
--enable-opencl \
--without-gslib \
+ --with-djvu \
+ --with-jxl \
--with-lqr \
--with-modules \
--with-openexr \
@@ -59,7 +60,6 @@ build() {
--with-wmf \
--with-xml \
--without-autotrace \
- --without-djvu \
--without-dps \
--without-fftw \
--without-fpx \
@@ -79,6 +79,7 @@ package_libmagick6() {
pkgdesc="${pkgdesc/)/; library)}"
optdepends=('ghostscript: PS/PDF support'
'libheif: HEIF support'
+ 'libjxl: JPEG XL support'
'libraw: DNG support'
'librsvg: SVG support'
'libwebp: WEBP support'
@@ -87,9 +88,10 @@ package_libmagick6() {
'ocl-icd: OpenCL support'
'openexr: OpenEXR support'
'openjpeg2: JPEG2000 support'
+ 'djvulibre: DJVU support'
'pango: Text rendering')
+ options=('!emptydirs' 'libtool')
backup=(etc/ImageMagick-6/{coder,colors,delegates,log,magic,mime,policy,quantization-table,thresholds,type,type-{dejavu,ghostscript}}.xml)
- options=('!docs' '!emptydirs' 'libtool')
cd ImageMagick6-$_pkgver
make DESTDIR="$pkgdir" install pkgconfigdir="/usr/lib/$pkgbase/pkgconfig"