aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/photo.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-05-08 21:40:51 +0200
committerMarius Bakke <mbakke@fastmail.com>2020-05-08 21:40:51 +0200
commit4bdf4182fe080c3409f6ef9b410146b67cfa2595 (patch)
treef1123ddb8c57eda6de026982904f6c5309adaca6 /gnu/packages/photo.scm
parentc81457a5883ea43950eb2ecdcbb58a5b144bcd11 (diff)
parent23a59b180b28b9fa22120c2b8305b9324442b94d (diff)
downloadguix-4bdf4182fe080c3409f6ef9b410146b67cfa2595.tar
guix-4bdf4182fe080c3409f6ef9b410146b67cfa2595.tar.gz
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/photo.scm')
-rw-r--r--gnu/packages/photo.scm12
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 1e9fab6ef3..59947964a3 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -177,7 +177,7 @@ cards and generate meaningful file and folder names.")
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
- `(("libjpeg" ,libjpeg))) ;for lossy DNGs and old Kodak cameras
+ `(("libjpeg" ,libjpeg-turbo))) ;for lossy DNGs and old Kodak cameras
(propagated-inputs
`(("lcms" ,lcms))) ;for color profiles
(home-page "https://www.libraw.org")
@@ -354,7 +354,7 @@ and a wide variety of other metadata.")
"1a4m3plmfcrrplqs9zfzhc5apibn10m5sajpizm1sd3q74w5fwq3"))))
(build-system cmake-build-system)
(inputs
- `(("libjpeg" ,libjpeg)
+ `(("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("zlib" ,zlib)))
@@ -396,7 +396,7 @@ overlapping images, as well as some command line tools.")
`(("boost" ,boost)
("gsl" ,gsl)
("lcms" ,lcms)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("openexr" ,openexr)
@@ -494,7 +494,7 @@ photographic equipment.")
("pugixml" ,pugixml)
("gtk+" ,gtk+)
("sqlite" ,sqlite)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("cairo" ,cairo)
("lcms" ,lcms)
@@ -547,7 +547,7 @@ and enhance them.")
("freeglut" ,freeglut)
("glew" ,glew)
("lcms" ,lcms)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpano13" ,libpano13)
("libpng" ,libpng)
("libtiff" ,libtiff)
@@ -632,7 +632,7 @@ a complete panorama and stitch any series of overlapping pictures.")
("lensfun" ,lensfun)
("libcanberra" ,libcanberra)
("libiptcdata" ,libiptcdata)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("librsvg" ,librsvg)
("libsigc++" ,libsigc++)