summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO62
-rw-r--r--[-rwxr-xr-x]PKGBUILD240
2 files changed, 153 insertions, 149 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 96df6806666b..b7ae55985ed3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,58 +1,62 @@
# Generated by mksrcinfo v8
-# Sat Jul 22 14:32:21 UTC 2017
+# Wed Aug 16 22:19:17 UTC 2017
pkgbase = imagemagick-full
pkgdesc = An image viewing/manipulation program (Q32 HDRI with all libs and features)
pkgver = 7.0.6.2
- pkgrel = 1
+ pkgrel = 2
url = http://www.imagemagick.org/
arch = i686
arch = x86_64
license = custom
makedepends = opencl-headers
- depends = jemalloc
- depends = bzip2
- depends = libx11
- depends = libxext
+ depends = libltdl
+ depends = lcms2
depends = libxt
- depends = libsm
- depends = zlib
- depends = autotrace-nomagick
- depends = fftw
- depends = flif
- depends = libfpx
+ depends = fontconfig
+ depends = libxext
+ depends = ghostscript
+ depends = openexr
+ depends = libwmf
+ depends = librsvg
+ depends = libxml2
+ depends = liblqr
+ depends = openjpeg2
+ depends = libraw
+ depends = opencl-icd-loader
+ depends = libwebp
+ depends = glu
+ depends = bzip2
depends = djvulibre
depends = ttf-dejavu
- depends = fontconfig
+ depends = fftw
depends = freetype2
- depends = libraqm
- depends = ghostscript
+ depends = fontconfig
depends = gsfonts
depends = graphviz
depends = jbigkit
- depends = libjpeg-turbo
- depends = lcms
+ depends = jemalloc
depends = lcms2
- depends = openjpeg2
- depends = liblqr
- depends = xz
- depends = glu
- depends = openexr
- depends = pango
+ depends = libjpeg-turbo
depends = libpng
- depends = librsvg
depends = libtiff
- depends = libwebp
- depends = libwmf
- depends = libxml2
- depends = libmpeg2
- depends = opencl-icd-loader
+ depends = pango
+ depends = perl
+ depends = xz
+ depends = zlib
+ depends = autotrace-nomagick
+ depends = flif
+ depends = libfpx
+ depends = libraqm
depends = libumem-git
optdepends = ttf-mac-fonts: for Apple fonts support
provides = imagemagick
+ provides = imagemagick7
+ provides = imagemagick-fftw
provides = libMagickCore-7.Q32HDRI.so
provides = libMagickWand-7.Q32HDRI.so
provides = libMagick++-7.Q32HDRI.so
conflicts = imagemagick
+ conflicts = imagemagick7
conflicts = imagemagick-git
conflicts = imagemagick-full-git
conflicts = imagemagick-fftw
diff --git a/PKGBUILD b/PKGBUILD
index 9f05d9785144..8bdfd4ef1bd9 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,5 @@
# Maintainer: Daniel Bermond < yahoo-com: danielbermond >
-# ImageMagick compiled with all features and delegate libraries.
-# Using quantum depth 32 (Q32) and HDRI.
-
-# AUR dependencies
-# ----------------
-# pstoedit-nomagick autotrace-nomagick flif libfpx libraqm libumem-git
-
# NOTE (1):
# DPS (Display PostScript) feature is obsolete and thus not enabled.
# For more information about DPS being obsolete please visit:
@@ -19,43 +12,50 @@
# This Windows font directory example is for people that copy/link fonts from a Windows
# installation. If you prefer, you can choose an AUR package that provides the Windows fonts
# as described in the Wiki and change the directory accordingly.
-# Apple fonts through AUR package 'tff-mac-fonts' are optional due to licensing issues. It
-# places fonts in directories '/usr/share/fonts/TTF' and '/usr/share/fonts/Type1'.
-_dejavu_font_dir="/usr/share/fonts/TTF"
-_gs_font_dir="/usr/share/fonts/Type1"
-_windows_font_dir="/usr/share/fonts/WindowsFonts"
-_1st_apple_font_dir="/usr/share/fonts/TTF"
-_2nd_apple_font_dir="/usr/share/fonts/Type1"
-_digest="http://www.imagemagick.org/download/digest.rdf"
-_srcname="ImageMagick"
-_srcver="$(curl -s "$_digest" | grep -o "${_srcname}-7[0-9\.-]*\.tar\.xz" | \
- sed 's/[^0-9\.-]*//g' | \
- sed -r 's/.//;s/.{2}$//' | \
- sort -r | \
+_dejavu_font_dir='/usr/share/fonts/TTF'
+_gs_font_dir='/usr/share/fonts/Type1'
+_windows_font_dir='/usr/share/fonts/WindowsFonts'
+_1st_apple_font_dir='/usr/share/fonts/TTF'
+_2nd_apple_font_dir='/usr/share/fonts/Type1'
+_digest='http://www.imagemagick.org/download/digest.rdf'
+_srcname='ImageMagick'
+_srcver="$(curl -s "$_digest" | grep -o "${_srcname}-7[0-9\.-]*\.tar\.xz" |
+ sed 's/[^0-9\.-]*//g' |
+ sed -r 's/.//;s/.{2}$//' |
+ sort -r |
head -n1)"
-_srcverregex="$(echo "$_srcver" | sed 's/\./\\\./g')" # translate to a regular expression
+_srcver_regex="$(printf '%s' "$_srcver" | sed 's/\./\\\./g')" # translate to a regular expression
+_qdepth='32'
+
pkgname=imagemagick-full
-pkgver="$(echo "$_srcver"| tr '-' '.')"
-pkgrel=1
-pkgdesc="An image viewing/manipulation program (Q32 HDRI with all libs and features)"
+pkgver="$(printf '%s' "$_srcver"| tr '-' '.')" # ImageMagick does not provide a download archive of all previous versions
+pkgrel=2
+pkgdesc="An image viewing/manipulation program (Q${_qdepth} HDRI with all libs and features)"
arch=('i686' 'x86_64')
-url="http://www.imagemagick.org/"
+url='http://www.imagemagick.org/'
license=('custom')
-depends=('jemalloc' 'bzip2' 'libx11' 'libxext' 'libxt' 'libsm' 'zlib'
- 'autotrace-nomagick' 'fftw' 'flif' 'libfpx' 'djvulibre'
- 'ttf-dejavu' 'fontconfig' 'freetype2' 'libraqm' 'ghostscript'
- 'gsfonts' 'graphviz' 'jbigkit' 'libjpeg-turbo' 'lcms' 'lcms2'
- 'openjpeg2' 'liblqr' 'xz' 'glu' 'openexr' 'pango' 'libpng'
- 'librsvg' 'libtiff' 'libwebp' 'libwmf' 'libxml2' 'libmpeg2'
- 'opencl-icd-loader' 'libumem-git')
-optdepends=('ttf-mac-fonts: for Apple fonts support')
+depends=(
+ # official repositories:
+ 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript'
+ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr' 'openjpeg2' 'libraw'
+ 'opencl-icd-loader' 'libwebp' 'glu'
+ 'bzip2' 'djvulibre' 'ttf-dejavu' 'fftw' 'freetype2' 'fontconfig'
+ 'gsfonts' 'graphviz' 'jbigkit' 'jemalloc' 'lcms2' 'libjpeg-turbo'
+ 'libpng' 'libtiff' 'pango' 'perl' 'xz' 'zlib'
+ # AUR:
+ 'autotrace-nomagick' 'flif' 'libfpx' 'libraqm' 'libumem-git'
+)
+optdepends=(
+ # AUR:
+ 'ttf-mac-fonts: for Apple fonts support'
+)
makedepends=('opencl-headers')
-provides=("imagemagick"
- "libMagickCore-${pkgver%%.*}.Q32HDRI.so"
- "libMagickWand-${pkgver%%.*}.Q32HDRI.so"
- "libMagick++-${pkgver%%.*}.Q32HDRI.so")
-conflicts=('imagemagick' 'imagemagick-git' 'imagemagick-full-git'
+provides=('imagemagick' 'imagemagick7' 'imagemagick-fftw'
+ "libMagickCore-${pkgver%%.*}.Q${_qdepth}HDRI.so"
+ "libMagickWand-${pkgver%%.*}.Q${_qdepth}HDRI.so"
+ "libMagick++-${pkgver%%.*}.Q${_qdepth}HDRI.so")
+conflicts=('imagemagick' 'imagemagick7' 'imagemagick-git' 'imagemagick-full-git'
'imagemagick-fftw' 'imagemagick-no-hdri')
backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
"etc/ImageMagick-${pkgver%%.*}/colors.xml"
@@ -72,92 +72,92 @@ backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
"etc/ImageMagick-${pkgver%%.*}/type-windows.xml")
options=('!docs' 'libtool' '!emptydirs')
source=("http://www.imagemagick.org/download/${_srcname}-${_srcver}.tar.xz")
-sha256sums=("$(curl -s ${_digest} | grep -A5 "${_srcname}-${_srcverregex}\.tar\.xz" | \
- grep 'sha256' | \
- grep -oE '>[[:alnum:]]*?<' | \
+sha256sums=("$(curl -s "$_digest" | grep -A5 "${_srcname}-${_srcver_regex}\.tar\.xz" |
+ grep 'sha256' |
+ grep -oE '>[[:alnum:]]*?<' |
sed 's/[><]//g')")
build() {
- cd "$_srcname"-"$_srcver"
-
- CPPFLAGS="-I/usr/include/FLIF" \
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --enable-openmp \
- --enable-opencl \
- --enable-largefile \
- --enable-static=no \
- --enable-shared=yes \
- --enable-fast-install=yes \
- --disable-delegate-build \
- --enable-cipher \
- --enable-hdri \
- --enable-hugepages \
- --enable-docs \
- --with-threads \
- --with-modules \
- --with-quantum-depth=32 \
- --with-magick-plus-plus \
- --with-perl \
- --with-perl-options="INSTALLDIRS=vendor" \
- --with-jemalloc \
- --with-umem \
- --with-bzlib \
- --with-x \
- --with-zlib \
- --with-autotrace \
- --without-dps \
- --with-fftw \
- --with-flif \
- --with-fpx \
- --with-djvu \
- --with-fontconfig \
- --with-freetype \
- --with-raqm \
- --with-gslib \
- --with-gvc \
- --with-jbig \
- --with-jpeg \
- --with-lcms \
- --with-openjp2 \
- --with-lqr \
- --with-lzma \
- --with-openexr \
- --with-pango \
- --with-png \
- --with-rsvg \
- --with-tiff \
- --with-webp \
- --with-wmf \
- --with-xml \
- --with-dejavu-font-dir="$_dejavu_font_dir" \
- --with-gs-font-dir="$_gs_font_dir" \
- --with-windows-font-dir="$_windows_font_dir" \
- --with-apple-font-dir="$_1st_apple_font_dir" \
- --with-fontpath="$_2nd_apple_font_dir"
-
- make
+ cd "${_srcname}-${_srcver}"
+
+ CPPFLAGS='-I/usr/include/FLIF' \
+ ./configure \
+ --prefix='/usr' \
+ --sysconfdir='/etc' \
+ --enable-openmp \
+ --enable-opencl \
+ --enable-largefile \
+ --enable-static='no' \
+ --enable-shared='yes' \
+ --enable-fast-install='yes' \
+ --disable-delegate-build \
+ --enable-cipher \
+ --enable-hdri \
+ --enable-hugepages \
+ --enable-docs \
+ --with-threads \
+ --with-modules \
+ --with-quantum-depth="${_qdepth}" \
+ --with-magick-plus-plus \
+ --with-perl \
+ --with-perl-options='INSTALLDIRS=vendor' \
+ --with-jemalloc \
+ --with-umem \
+ --with-bzlib \
+ --with-x \
+ --with-zlib \
+ --with-autotrace \
+ --without-dps \
+ --with-fftw \
+ --with-flif \
+ --with-fpx \
+ --with-djvu \
+ --with-fontconfig \
+ --with-freetype \
+ --with-raqm \
+ --with-gslib \
+ --with-gvc \
+ --with-jbig \
+ --with-jpeg \
+ --with-lcms \
+ --with-openjp2 \
+ --with-lqr \
+ --with-lzma \
+ --with-openexr \
+ --with-pango \
+ --with-png \
+ --with-rsvg \
+ --with-tiff \
+ --with-webp \
+ --with-wmf \
+ --with-xml \
+ --with-dejavu-font-dir="$_dejavu_font_dir" \
+ --with-gs-font-dir="$_gs_font_dir" \
+ --with-windows-font-dir="$_windows_font_dir" \
+ --with-apple-font-dir="$_1st_apple_font_dir" \
+ --with-fontpath="$_2nd_apple_font_dir"
+
+ make
}
package() {
- cd "$_srcname"-"$_srcver"
-
- make DESTDIR="$pkgdir/" install
-
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -D -m644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
-
- # Security fix
- # https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=29588
- # https://imagetragick.com/
- sed -i '65i\ \<policy domain="coder" rights="none" pattern="EPHEMERAL" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
- sed -i '66i\ \<policy domain="coder" rights="none" pattern="URL" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
- sed -i '67i\ \<policy domain="coder" rights="none" pattern="HTTPS" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
- sed -i '68i\ \<policy domain="coder" rights="none" pattern="MVG" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
- sed -i '69i\ \<policy domain="coder" rights="none" pattern="MSL" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
- sed -i '70i\ \<policy domain="coder" rights="none" pattern="TEXT" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
- sed -i '71i\ \<policy domain="coder" rights="none" pattern="SHOW" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
- sed -i '72i\ \<policy domain="coder" rights="none" pattern="WIN" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
- sed -i '73i\ \<policy domain="coder" rights="none" pattern="PLT" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+ cd "${_srcname}-${_srcver}"
+
+ make DESTDIR="$pkgdir" install
+
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -D -m644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
+
+ # security fix
+ # https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=29588
+ # https://imagetragick.com/
+ sed -i '65i\ \<policy domain="coder" rights="none" pattern="EPHEMERAL" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+ sed -i '66i\ \<policy domain="coder" rights="none" pattern="URL" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+ sed -i '67i\ \<policy domain="coder" rights="none" pattern="HTTPS" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+ sed -i '68i\ \<policy domain="coder" rights="none" pattern="MVG" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+ sed -i '69i\ \<policy domain="coder" rights="none" pattern="MSL" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+ sed -i '70i\ \<policy domain="coder" rights="none" pattern="TEXT" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+ sed -i '71i\ \<policy domain="coder" rights="none" pattern="SHOW" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+ sed -i '72i\ \<policy domain="coder" rights="none" pattern="WIN" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+ sed -i '73i\ \<policy domain="coder" rights="none" pattern="PLT" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
}