09/40: gnu: ImageMagick: Update to 6.9.11-48.

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit cb89b36cbcd9dee265787bcd0af9502e236059bb
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Dec 12 16:27:01 2020 +0100

    gnu: ImageMagick: Update to 6.9.11-48.
    
    * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.11-48.
    (imagemagick-next): Remove variable.
    * gnu/packages/video.scm (transcode)[inputs]: Change from IMAGEMAGICK-NEXT 
to
    IMAGEMAGICK.
---
 gnu/packages/imagemagick.scm | 18 ++----------------
 gnu/packages/video.scm       |  2 +-
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index a624d7b..383a3f9 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -49,14 +49,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-34")
+    (version "6.9.11-48")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://imagemagick/ImageMagick-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "0acdjkkgjgpfcwj9h9zncywjjrrgb9sh0cvfn3jamjxh5byf638s"))))
+               "0m8nkmywkqwyrr01q7aiakj6mi4rb2psjgzv8n0x82x3s1rpfyql"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch"
@@ -125,20 +125,6 @@ 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 e4576de..17037c2 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -246,7 +246,7 @@
        ("faac" ,faac)
        ("ffmpeg" ,ffmpeg)
        ("freetype" ,freetype)
-       ("imagemagick" ,imagemagick-next)
+       ("imagemagick" ,imagemagick)
        ("lame" ,lame)
        ("liba52" ,liba52)
        ("libdv" ,libdv)