From ed2f0ca8b1140870d55b12cc914472ef026b8e15 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 22:34:40 +0200 Subject: gnu: ImageMagick: Update to 6.9.11-24. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.11-24. --- gnu/packages/imagemagick.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/imagemagick.scm') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index ccc0cfb493..74dfe5cd56 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -48,14 +48,14 @@ ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.11-11") + (version "6.9.11-24") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "1b67rrppvm04aqr76qky5h2a0j2d161h8kwa04fv611w5xwandr2")))) + "1qxp8fpinh45y4fzdpqvwv2kgr8bh7dqfl08h9n24yadi5nxcqbk")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" -- cgit v1.2.3 From 2565b900681922fbc4dcab528eccac6b3b29b4b5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 11 Oct 2020 16:39:32 +0200 Subject: gnu: ImageMagick: Update to 6.9.11-34. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.11-34. --- gnu/packages/imagemagick.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/imagemagick.scm') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 74dfe5cd56..e4efea4e45 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -48,14 +48,14 @@ ;; The 7 release series has an incompatible API, while the 6 series is still ;; maintained. Don't update to 7 until we've made sure that the ImageMagick ;; users are ready for the 7-series API. - (version "6.9.11-24") + (version "6.9.11-34") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" version ".tar.xz")) (sha256 (base32 - "1qxp8fpinh45y4fzdpqvwv2kgr8bh7dqfl08h9n24yadi5nxcqbk")))) + "0acdjkkgjgpfcwj9h9zncywjjrrgb9sh0cvfn3jamjxh5byf638s")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" -- cgit v1.2.3 From 4688dc9bb89a3b753edcbcfb6bcd5ef0df69e584 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 11 Nov 2020 21:33:04 +0100 Subject: gnu: transcode: Build with a newer ImageMagick. * gnu/packages/imagemagick.scm (imagemagick-next): New public variable. * gnu/packages/video.scm (transcode)[inputs]: Change from IMAGEMAGICK to IMAGEMAGICK-NEXT. --- gnu/packages/imagemagick.scm | 15 +++++++++++++++ gnu/packages/video.scm | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu/packages/imagemagick.scm') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index e4efea4e45..a624d7bc6a 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -124,6 +125,20 @@ transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.") (license (license:fsf-free "http://www.imagemagick.org/script/license.php")))) +;; XXX: 'transcode' fails to detect the above ImageMagick, so we provide +;; this newer version. +(define-public imagemagick-next + (package + (inherit imagemagick) + (version "6.9.11-37") + (source (origin + (method url-fetch) + (uri (string-append "mirror://imagemagick/ImageMagick-" + version ".tar.xz")) + (sha256 + (base32 + "19r6fyhr1bycx0p6jz034mil1zh2k7hfr02is40h4g3wf9b9sdni")))))) + (define-public perl-image-magick (package (name "perl-image-magick") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 60a3928e32..04c3687454 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -245,7 +245,7 @@ ("faac" ,faac) ("ffmpeg" ,ffmpeg) ("freetype" ,freetype) - ("imagemagick" ,imagemagick) + ("imagemagick" ,imagemagick-next) ("lame" ,lame) ("liba52" ,liba52) ("libdv" ,libdv) -- cgit v1.2.3