diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-14 16:57:37 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-14 17:15:08 -0400 |
| commit | 3bacd3c76a58ebe70f98be654f09cbd4166093ab (patch) | |
| tree | 89f687565205971a9925d33400235968a569a069 /gnu/packages/image.scm | |
| parent | df3391c0309443ac37f9a9a6b1038a85454b8ee6 (diff) | |
| parent | 97ed675718b948319e6f6e51f2d577971bea1176 (diff) | |
| download | guix-3bacd3c76a58ebe70f98be654f09cbd4166093ab.tar.gz | |
Merge branch 'master' into core-updates.
Conflicts: gnu/local.mk gnu/packages/build-tools.scm gnu/packages/certs.scm gnu/packages/check.scm gnu/packages/compression.scm gnu/packages/cups.scm gnu/packages/fontutils.scm gnu/packages/gnuzilla.scm gnu/packages/guile.scm gnu/packages/ibus.scm gnu/packages/image-processing.scm gnu/packages/linux.scm gnu/packages/music.scm gnu/packages/nss.scm gnu/packages/pdf.scm gnu/packages/python-xyz.scm gnu/packages/qt.scm gnu/packages/ruby.scm gnu/packages/shells.scm gnu/packages/tex.scm gnu/packages/video.scm gnu/packages/vulkan.scm gnu/packages/web.scm gnu/packages/webkit.scm gnu/packages/wm.scm
Diffstat (limited to 'gnu/packages/image.scm')
| -rw-r--r-- | gnu/packages/image.scm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 949dbfe902..754c99a823 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com> ;;; Copyright © 2022 ( <paren@disroot.org> ;;; Copyright © 2022-2023 Bruno Victal <mirai@makinata.eu> +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -458,7 +459,7 @@ lossless JPEG manipulations such as rotation, scaling or cropping: (lambda _ ;; The Makefile uses optimization level 1, so the same ;; level is used here for consistency. - (invoke "gcc" "-shared" "-fPIC" "-O" + (invoke ,(cc-for-target) "-shared" "-fPIC" "-O" ;; Common files. "adapthuff.o" "image.o" "strcodec.o" "strPredQuant.o" "strTransform.o" "perfTimerANSI.o" @@ -469,7 +470,7 @@ lossless JPEG manipulations such as rotation, scaling or cropping: "encode.o" "segenc.o" "strenc.o" "strFwdTransform.o" "strPredQuantEnc.o" "-o" "libjpegxr.so") - (invoke "gcc" "-shared" "-fPIC" "-O" + (invoke ,(cc-for-target) "-shared" "-fPIC" "-O" ;; Glue files. "JXRGlue.o" "JXRMeta.o" "JXRGluePFC.o" "JXRGlueJxr.o" ;; Test files. @@ -1290,7 +1291,7 @@ language bindings to VIGRA.") (define-public libwebp (package (name "libwebp") - (version "1.2.2") + (version "1.2.4") (source (origin ;; No tarballs are provided for >0.6.1. @@ -1301,7 +1302,7 @@ language bindings to VIGRA.") (file-name (git-file-name name version)) (sha256 (base32 - "1khqkm5j9aiii9jfsbxzzyz3x33sifzcx537cyjyb3a2g2rl969k")))) + "1jndbc99dd19a6d7h4ds51xyak7gfddkbi41nxdm8n23w7ks35r8")))) (build-system gnu-build-system) (inputs (list freeglut @@ -1726,9 +1727,6 @@ and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).") license:ijg ;the libjpeg library and associated tools license:zlib)))) ;the libjpeg-turbo SIMD extensions -(define-deprecated libjpeg libjpeg-turbo) -(export libjpeg) - (define-public niftilib (package (name "niftilib") @@ -2199,7 +2197,8 @@ This package can be used to create @code{favicon.ico} files for web sites.") (string-append #$gdk-pixbuf "/bin/gdk-pixbuf-thumbnailer"))))) (add-after 'install 'install-readme (lambda _ - (let ((doc (string-append #$output "/share/doc/libavif-" #$version))) + (let ((doc (string-append #$output "/share/doc/libavif-" + #$(package-version this-package)))) (install-file "../source/README.md" doc)))) (add-after 'install 'split (lambda _ |