summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Severance2015-09-30 11:26:44 -0400
committerChris Severance2015-09-30 11:26:44 -0400
commitb498ec28068421204152a8b52d6202e3e862e787 (patch)
tree07cf74625396eb11b54a4a8e1b1b146bb50d021f
parent7d3eb38dc0d55932fa1cf2dc5402be9869a2cfa7 (diff)
downloadaur-b498ec28068421204152a8b52d6202e3e862e787.tar.gz
Update SRCINFO
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD10
2 files changed, 5 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cb07b2a7d922..e1d8c6734d48 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = imagemagick-git
pkgdesc = An image viewing/manipulation program
- pkgver = 7.0.0.0.r10090.g7e784cd
+ pkgver = 7.0.0.0.r10204.g979447c
pkgrel = 1
url = http://www.imagemagick.org/script/
arch = i686
@@ -21,6 +21,7 @@ pkgbase = imagemagick-git
makedepends = opencl-headers
makedepends = libcl
makedepends = libwebp
+ makedepends = patch
makedepends = git
source = imagemagick-git::git+http://git.imagemagick.org/repos/ImageMagick.git
source = libpng_mmx_patch_x86_64.patch
diff --git a/PKGBUILD b/PKGBUILD
index c50404555c80..560df6d50f1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ _pkgname='imagemagick'
pkgbase="${_pkgname}-git"
_srcdir="${pkgbase}"
pkgname=("${pkgbase}" "${pkgbase}-doc")
-pkgver=7.0.0.0.r10090.g7e784cd
+pkgver=7.0.0.0.r10204.g979447c
pkgrel=1
pkgdesc='An image viewing/manipulation program'
arch=('i686' 'x86_64')
@@ -19,12 +19,10 @@ url='http://www.imagemagick.org/script/'
license=('custom')
makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript'
'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr' 'openjpeg2'
- 'opencl-headers' 'libcl' 'libwebp' 'git')
-#source=("ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}".tar.xz{,.asc})
-#source=("${pkgname}::svn+https://subversion.imagemagick.org/subversion/ImageMagick/trunk/") # svn was shut down August 10, 2015
+ 'opencl-headers' 'libcl' 'libwebp' 'patch' 'git')
_verwatch=("${url/script/download/}" 'ImageMagick-\([-0-9\.]\+\)\.tar\.bz2' 'l')
_archlink="@@@::https://projects.archlinux.org/togit/packages.git/plain/trunk/@@@?h=packages/${_pkgname}"
-source=("${pkgname}::git+http://git.imagemagick.org/repos/ImageMagick.git"
+source=("${_srcdir}::git+http://git.imagemagick.org/repos/ImageMagick.git"
'libpng_mmx_patch_x86_64.patch'
"${_archlink//@@@/perlmagick.rpath.patch}")
sha256sums=('SKIP'
@@ -35,9 +33,7 @@ sha256sums=('SKIP'
pkgver() {
set -u
cd "${_srcdir}/"
- #echo $(grep -o -m1 '[0-9.-]\+' "${pkgname}/ChangeLog" | sed -n '2p' | tr '-' '.').$(svnversion "${SRCDEST}/${pkgname}/" | tr -d 'a-zA-z')
local _version="$(grep -o -m1 '[0-9]\+\.[0-9]\+\.[0-9\.-]\+' 'ChangeLog')"
- #_version="${_version//-/.}.$(svnversion | tr -d 'a-zA-z')"
printf '%s.r%s.g%s' "${_version//-/.}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
set +u
}