ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-19 05:07:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ImageMagick: Update to 6.9.11-48.

Browse source 
* 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.
This commit is contained in:
Marius Bakke 2020-12-12 16:27:01 +01:00
parent 575f83504b
commit cb89b36cbc
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/imagemagick.scm
View file

@ -49,14 +49,14 @@ (define-public imagemagick
;; The 7 release series has an incompatible API, while the 6 series is still ;; 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 ;; maintained. Don't update to 7 until we've made sure that the ImageMagick
;; users are ready for the 7-series API. ;; users are ready for the 7-series API.
(version "6.9.11-34") (version "6.9.11-48")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://imagemagick/ImageMagick-" (uri (string-append "mirror://imagemagick/ImageMagick-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0acdjkkgjgpfcwj9h9zncywjjrrgb9sh0cvfn3jamjxh5byf638s")))) "0m8nkmywkqwyrr01q7aiakj6mi4rb2psjgzv8n0x82x3s1rpfyql"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch"
@ -125,20 +125,6 @@ (define-public imagemagick
text, lines, polygons, ellipses and Bézier curves.") text, lines, polygons, ellipses and Bézier curves.")
(license (license:fsf-free "http://www.imagemagick.org/script/license.php")))) (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 (define-public perl-image-magick
(package (package
(name "perl-image-magick") (name "perl-image-magick")

2
gnu/packages/video.scm
View file

@ -246,7 +246,7 @@ (define-public transcode
("faac" ,faac) ("faac" ,faac)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg)
("freetype" ,freetype) ("freetype" ,freetype)
("imagemagick" ,imagemagick-next) ("imagemagick" ,imagemagick)
("lame" ,lame) ("lame" ,lame)
("liba52" ,liba52) ("liba52" ,liba52)
("libdv" ,libdv) ("libdv" ,libdv)