* [bug#39197] [PATCH core-updates 0/4] Replace libjpeg with libjpeg-turbo
@ 2020-01-19 23:16 Marius Bakke
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 1/4] gnu: RHash: Do not use git-fetch, but provide a fallback URL Marius Bakke
2020-01-20 14:06 ` [bug#39197] [PATCH core-updates 2/4] gnu: cmake-minimal: Build with a minimal variant of cURL Jakub Kądziołka
0 siblings, 2 replies; 7+ messages in thread
From: Marius Bakke @ 2020-01-19 23:16 UTC (permalink / raw)
To: 39197
AIUI most distributions have moved away from the IJG libjpeg library in
favor of libjpeg-turbo (which is ABI- and API-compatible, and under lots
of scrutiny by security researchers).
This series do the same for Guix.
Marius Bakke (4):
gnu: RHash: Do not use git-fetch, but provide a fallback URL.
gnu: cmake-minimal: Build with a minimal variant of cURL.
gnu: Replace uses of 'libjpeg' with 'libjpeg-turbo'.
gnu: Deprecate the 'libjpeg' variable.
gnu/packages/abiword.scm | 2 +-
gnu/packages/admin.scm | 2 +-
gnu/packages/algebra.scm | 2 +-
gnu/packages/animation.scm | 2 +-
gnu/packages/astronomy.scm | 4 ++--
gnu/packages/cdrom.scm | 2 +-
gnu/packages/cmake.scm | 5 ++++-
gnu/packages/cran.scm | 6 +++---
gnu/packages/crypto.scm | 18 ++++++++++++------
gnu/packages/cups.scm | 4 ++--
gnu/packages/curl.scm | 16 ++++++++++++++--
gnu/packages/display-managers.scm | 2 +-
gnu/packages/ebook.scm | 2 +-
gnu/packages/emacs.scm | 2 +-
gnu/packages/emulators.scm | 2 +-
gnu/packages/enlightenment.scm | 2 +-
gnu/packages/fltk.scm | 4 ++--
gnu/packages/fontutils.scm | 2 +-
gnu/packages/freedesktop.scm | 2 +-
gnu/packages/game-development.scm | 12 ++++++------
gnu/packages/games.scm | 20 ++++++++++----------
gnu/packages/gd.scm | 4 ++--
gnu/packages/ghostscript.scm | 6 +++---
gnu/packages/gimp.scm | 4 ++--
gnu/packages/gnome.scm | 8 ++++----
gnu/packages/gnunet.scm | 2 +-
gnu/packages/gnustep.scm | 2 +-
gnu/packages/graphics.scm | 14 +++++++-------
gnu/packages/graphviz.scm | 2 +-
gnu/packages/gstreamer.scm | 2 +-
gnu/packages/gtk.scm | 2 +-
gnu/packages/image-processing.scm | 16 ++++++++--------
gnu/packages/image-viewers.scm | 4 ++--
gnu/packages/image.scm | 31 +++++++++++++++++--------------
gnu/packages/imagemagick.scm | 4 ++--
gnu/packages/java.scm | 10 +++++-----
gnu/packages/kde-frameworks.scm | 2 +-
gnu/packages/kodi.scm | 2 +-
gnu/packages/machine-learning.scm | 4 ++--
gnu/packages/mate.scm | 4 ++--
gnu/packages/maths.scm | 8 ++++----
gnu/packages/netpbm.scm | 2 +-
gnu/packages/pdf.scm | 8 ++++----
gnu/packages/photo.scm | 12 ++++++------
gnu/packages/prolog.scm | 2 +-
gnu/packages/python-xyz.scm | 4 ++--
gnu/packages/qt.scm | 6 +++---
gnu/packages/rdesktop.scm | 2 +-
gnu/packages/scanner.scm | 4 ++--
gnu/packages/scheme.scm | 2 +-
gnu/packages/scribus.scm | 2 +-
gnu/packages/sdl.scm | 4 ++--
gnu/packages/spice.scm | 2 +-
gnu/packages/statistics.scm | 2 +-
gnu/packages/tcl.scm | 2 +-
gnu/packages/upnp.scm | 2 +-
gnu/packages/video.scm | 8 ++++----
gnu/packages/web-browsers.scm | 4 ++--
gnu/packages/web.scm | 2 +-
gnu/packages/webkit.scm | 2 +-
gnu/packages/wine.scm | 2 +-
gnu/packages/wv.scm | 2 +-
gnu/packages/wxwidgets.scm | 4 ++--
gnu/packages/xdisorg.scm | 2 +-
gnu/packages/xfce.scm | 2 +-
gnu/packages/xfig.scm | 4 ++--
gnu/packages/xorg.scm | 2 +-
67 files changed, 179 insertions(+), 155 deletions(-)
--
2.24.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#39197] [PATCH core-updates 1/4] gnu: RHash: Do not use git-fetch, but provide a fallback URL.
2020-01-19 23:16 [bug#39197] [PATCH core-updates 0/4] Replace libjpeg with libjpeg-turbo Marius Bakke
@ 2020-01-19 23:20 ` Marius Bakke
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 2/4] gnu: cmake-minimal: Build with a minimal variant of cURL Marius Bakke
` (2 more replies)
2020-01-20 14:06 ` [bug#39197] [PATCH core-updates 2/4] gnu: cmake-minimal: Build with a minimal variant of cURL Jakub Kądziołka
1 sibling, 3 replies; 7+ messages in thread
From: Marius Bakke @ 2020-01-19 23:20 UTC (permalink / raw)
To: 39197
* gnu/packages/crypto.scm (rhash)[source]: Change to URL-FETCH.
---
gnu/packages/crypto.scm | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 276612f887..9a545e7311 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -14,6 +14,7 @@
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org>
+;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -711,14 +712,19 @@ BLAKE.")
(version "1.3.9")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/rhash/RHash")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ ;; Note: This package is a dependency of CMake, which is needed to build
+ ;; libjpeg-turbo and ultimately 'git-minimal', so we cannot use 'git-fetch'
+ ;; here. Use the generated tarball with a Debian fallback for now; upstream
+ ;; is aware of the problem: <https://github.com/rhash/RHash/issues/108>.
+ (uri (list (string-append "https://github.com/rhash/RHash/archive/v"
+ version ".tar.gz")
+ (string-append "http://ftp.debian.org/debian/pool/main/r/rhash/"
+ "rhash_" version ".orig.tar.gz")))
+ (file-name (string-append "rhash-" version ".tar.gz"))
(sha256
(base32
- "06i49x1l21h2q7pfnf4crbmjyg8b9ad0qs10ywyyn5sjpi0c21wq"))))
+ "1xn9fqa6rlnhsbgami45g82dlw9i1skg2sri3ydiinwak5ph1ca2"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags
--
2.24.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#39197] [PATCH core-updates 2/4] gnu: cmake-minimal: Build with a minimal variant of cURL.
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 1/4] gnu: RHash: Do not use git-fetch, but provide a fallback URL Marius Bakke
@ 2020-01-19 23:20 ` Marius Bakke
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 3/4] gnu: Replace uses of 'libjpeg' with 'libjpeg-turbo' Marius Bakke
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 4/4] gnu: Deprecate the 'libjpeg' variable Marius Bakke
2 siblings, 0 replies; 7+ messages in thread
From: Marius Bakke @ 2020-01-19 23:20 UTC (permalink / raw)
To: 39197
This is necessary to avoid a circular dependency in the next commit.
* gnu/packages/curl.scm (curl-minimal): New public variable.
* gnu/packages/cmake.scm (cmake-minimal)[inputs]: Change from CURL to CURL-MINIMAL.
(cmake)[inputs]: Do the opposite.
---
gnu/packages/cmake.scm | 5 ++++-
gnu/packages/curl.scm | 16 ++++++++++++++--
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index e24b6dea7d..d053935a86 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -152,7 +152,7 @@
(apply invoke "./configure" configure-flags))))))
(native-inputs
`(("bzip2" ,bzip2)
- ("curl" ,curl)
+ ("curl" ,curl-minimal)
("expat" ,expat)
("file" ,file)
("libarchive" ,libarchive)
@@ -221,6 +221,9 @@ and workspaces that can be used in the compiler environment of your choice.")
`(,@(package-native-inputs cmake-minimal)
("python-sphinx" ,python-sphinx)
("texinfo" ,texinfo)))
+ (inputs
+ `(("curl" ,curl)
+ ,@(alist-delete "curl" (package-inputs cmake-minimal))))
(outputs '("out" "doc"))
(properties (alist-delete 'hidden? (package-properties cmake-minimal)))))
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 3d230dc1f0..4a73b1f34c 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2017, 2019 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
@@ -46,7 +46,8 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages tls)
- #:use-module (gnu packages web))
+ #:use-module (gnu packages web)
+ #:use-module (srfi srfi-1))
(define-public curl
(package
@@ -154,6 +155,17 @@ tunneling, and so on.")
"See COPYING in the distribution."))
(home-page "https://curl.haxx.se/")))
+;; This package is used to solve a cyclic dependency between 'cmake-minimal' and
+;; packages that use cmake-build-system such as 'libjpeg-turbo' (via ghostscript).
+;; It must not depend on anything that uses cmake-build-system.
+(define-public curl-minimal
+ (hidden-package
+ (package/inherit
+ curl
+ (name "curl-minimal")
+ (native-inputs (alist-delete "groff" (package-native-inputs curl)))
+ (inputs (alist-delete "openldap" (package-inputs curl))))))
+
(define-public kurly
(package
(name "kurly")
--
2.24.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#39197] [PATCH core-updates 3/4] gnu: Replace uses of 'libjpeg' with 'libjpeg-turbo'.
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 1/4] gnu: RHash: Do not use git-fetch, but provide a fallback URL Marius Bakke
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 2/4] gnu: cmake-minimal: Build with a minimal variant of cURL Marius Bakke
@ 2020-01-19 23:20 ` Marius Bakke
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 4/4] gnu: Deprecate the 'libjpeg' variable Marius Bakke
2 siblings, 0 replies; 7+ messages in thread
From: Marius Bakke @ 2020-01-19 23:20 UTC (permalink / raw)
To: 39197
* gnu/packages/abiword.scm (abiword)[inputs]: Change from LIBJPEG to
LIBJPEG-TURBO.
* gnu/packages/admin.scm (testdisk)[inputs]: Likewise.
* gnu/packages/algebra.scm (giac)[inputs]: Likewise.
* gnu/packages/animation.scm (synfig)[inputs]: Likewise.
* gnu/packages/astronomy.scm (gnuastro, celestia)[inputs]: Likewise.
* gnu/packages/cdrom.scm (dvdstyler)[inputs]: Likewise.
* gnu/packages/cran.scm (r-jpeg, r-tiff, r-readbitmap)[inputs]: Likewise.
* gnu/packages/cups.scm (cups-filters, hplip)[inputs]: Likewise.
* gnu/packages/display-managers.scm (slim)[inputs]: Likewise.
* gnu/packages/ebook.scm (fbreader)[inputs]: Likewise.
* gnu/packages/emacs.scm (emacs)[inputs]: Likewise.
* gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Likewise.
* gnu/packages/fltk.scm (fltk, ntk)[inputs]: Likewise.
* gnu/packages/fontutils.scm (fontforge)[inputs]: Likewise.
* gnu/packages/freedesktop.scm (weston)[inputs]: Likewise.
* gnu/packages/game-development.scm (sfml, allegro, aseprite, python-pygame,
eureka, ioquake3)[inputs]: Likewise.
* gnu/packages/games.scm (adanaxisgpl, freedroidrpg, irrlicht, minetest,
fizmo, supertuxkart, gzdoom, xmoto, xonotic)[inputs]: Likewise.
* gnu/packages/gd.scm (gd, perl-gd)[inputs]: Likewise.
* gnu/packages/ghostscript.scm (lcms)[inputs]: Likewise.
(ghostscript)[inputs, native-inputs]: Likewise.
* gnu/packages/gimp.scm (gegl, gimp)[inputs]: Likewise.
* gnu/packages/gnome.scm (libgnomeui, eog, tracker-miners, gthumb)[inputs]: Likewise.
* gnu/packages/gnunet.scm (libextractor)[inputs]: Likewise.
* gnu/packages/gnustep.scm (windowmaker)[inputs]: Likewise.
* gnu/packages/graphics.scm (blender, blender-2.79, openimageio,
openscenegraph, openscenegraph-3.4, povray, fgallery)[inputs]: Likewise.
* gnu/packages/graphviz.scm (graphviz)[inputs]: Likewise.
* gnu/packages/gstreamer.scm (gst-plugins-good)[inputs]: Likewise.
* gnu/packages/gtk.scm (gdk-pixbuf)[inputs]: Likewise.
* gnu/packages/image-processing.scm (dcmtk, mia, vtk, opencv, vips, nip2, vxl,
insight-toolkit)[inputs]: Likewise.
* gnu/packages/image-viewers.scm (gpicview, luminance-hdr)[inputs]: Likewise.
* gnu/packages/image.scm (jpegoptim, libtiff, leptonica, imlib2, freeimage,
vigra, libwebp, libmng, jasper, steghide, jp2a)[inputs]: Likewise.
* gnu/packages/imagemagick.scm (imagemagick, graphicsmagick)[inputs]: Likewise.
* gnu/packages/java.scm (icedtea-6, icedtea-7, openjdk9, openjdk11,
openjdk12)[inputs]: Likewise.
* gnu/packages/kde-frameworks.scm (khtml)[inputs]: Likewise.
* gnu/packages/kodi.scm (kodi)[inputs]: Likewise.
* gnu/packages/machine-learning.scm (dlib, tensorflow)[inputs]: Likewise.
* gnu/packages/mate.scm (atril, eom)[inputs]: Likewise.
* gnu/packages/maths.scm (hdf4, hdf-java, hdf-eos2, netcdf)[inputs]: Likewise.
* gnu/packages/netpbm.scm (netpbm)[inputs]: Likewise.
* gnu/packages/pdf.scm (zathura-pdf-mupdf, podofo, mupdf, fbida)[inputs]: Likewise.
* gnu/packages/photo.scm (libraw, libpano13, enblend-enfuse, darktable, hugin,
rawtherapee)[inputs]: Likewise.
* gnu/packages/prolog.scm (swi-prolog)[native-inputs]: Likewise.
* gnu/packages/python-xyz.scm (python-hdf4, python-pillow)[inputs]: Likewise.
* gnu/packages/qt.scm (qtbase, qtwebkit)[inputs]: Likewise.
* gnu/packages/rdesktop.scm (freerdp)[inputs]: Likewise.
* gnu/packages/scanner.scm (sane-backends, xsane)[inputs]: Likewise.
* gnu/packages/scheme.scm (racket)[inputs]: Likewise.
* gnu/packages/scribus.scm (scribus)[inputs]: Likewise.
* gnu/packages/sdl.scm (sdl-image)[propagated-inputs]: Likewise.
(guile-sdl)[native-inputs]: Likewise.
* gnu/packages/spice.scm (spice-gtk)[inputs]: Likewise.
* gnu/packages/statistics.scm (r-with-tests)[inputs]: Likewise.
* gnu/packages/tcl.scm (perl-tk)[inputs]: Likewise.
* gnu/packages/upnp.scm (readymedia)[inputs]: Likewise.
* gnu/packages/video.scm (mplayer, mpv, v4l-utils, motion)[inputs]: Likewise.
* gnu/packages/web-browsers.scm (dillo, links)[inputs]: Likewise.
* gnu/packages/web.scm (netsurf)[inputs]: Likewise.
* gnu/packages/webkit.scm (webkitgtk)[inputs]: Likewise.
* gnu/packages/wine.scm (wine)[inputs]: Likewise.
* gnu/packages/wv.scm (wv)[inputs]: Likewise.
* gnu/packages/wxwidgets.scm (wxwidgets, wxwidgets-2)[inputs]: Likewise.
* gnu/packages/xdisorg.scm (xscreensaver)[inputs]: Likewise.
* gnu/packages/xfce.scm (tumbler)[inputs]: Likewise.
* gnu/packages/xfig.scm (xfig, transfig)[inputs]: Likewise.
* gnu/packages/xorg.scm (xpra)[inputs]: Likewise.
---
gnu/packages/abiword.scm | 2 +-
gnu/packages/admin.scm | 2 +-
gnu/packages/algebra.scm | 2 +-
gnu/packages/animation.scm | 2 +-
gnu/packages/astronomy.scm | 4 ++--
gnu/packages/cdrom.scm | 2 +-
gnu/packages/cran.scm | 6 +++---
gnu/packages/cups.scm | 4 ++--
gnu/packages/display-managers.scm | 2 +-
gnu/packages/ebook.scm | 2 +-
gnu/packages/emacs.scm | 2 +-
gnu/packages/enlightenment.scm | 2 +-
gnu/packages/fltk.scm | 4 ++--
gnu/packages/fontutils.scm | 2 +-
gnu/packages/freedesktop.scm | 2 +-
gnu/packages/game-development.scm | 12 ++++++------
gnu/packages/games.scm | 18 +++++++++---------
gnu/packages/gd.scm | 4 ++--
gnu/packages/ghostscript.scm | 6 +++---
gnu/packages/gimp.scm | 4 ++--
gnu/packages/gnome.scm | 8 ++++----
gnu/packages/gnunet.scm | 2 +-
gnu/packages/gnustep.scm | 2 +-
gnu/packages/graphics.scm | 14 +++++++-------
gnu/packages/graphviz.scm | 2 +-
gnu/packages/gstreamer.scm | 2 +-
gnu/packages/gtk.scm | 2 +-
gnu/packages/image-processing.scm | 16 ++++++++--------
gnu/packages/image-viewers.scm | 4 ++--
gnu/packages/image.scm | 22 +++++++++++-----------
gnu/packages/imagemagick.scm | 4 ++--
gnu/packages/java.scm | 10 +++++-----
gnu/packages/kde-frameworks.scm | 2 +-
gnu/packages/kodi.scm | 2 +-
gnu/packages/machine-learning.scm | 4 ++--
gnu/packages/mate.scm | 4 ++--
gnu/packages/maths.scm | 8 ++++----
gnu/packages/netpbm.scm | 2 +-
gnu/packages/pdf.scm | 8 ++++----
gnu/packages/photo.scm | 12 ++++++------
gnu/packages/prolog.scm | 2 +-
gnu/packages/python-xyz.scm | 4 ++--
gnu/packages/qt.scm | 4 ++--
gnu/packages/rdesktop.scm | 2 +-
gnu/packages/scanner.scm | 4 ++--
gnu/packages/scheme.scm | 2 +-
gnu/packages/scribus.scm | 2 +-
gnu/packages/sdl.scm | 4 ++--
gnu/packages/spice.scm | 2 +-
gnu/packages/statistics.scm | 2 +-
gnu/packages/tcl.scm | 2 +-
gnu/packages/upnp.scm | 2 +-
gnu/packages/video.scm | 8 ++++----
gnu/packages/web-browsers.scm | 4 ++--
gnu/packages/web.scm | 2 +-
gnu/packages/webkit.scm | 2 +-
gnu/packages/wine.scm | 2 +-
gnu/packages/wv.scm | 2 +-
gnu/packages/wxwidgets.scm | 4 ++--
gnu/packages/xdisorg.scm | 2 +-
gnu/packages/xfce.scm | 2 +-
gnu/packages/xfig.scm | 4 ++--
gnu/packages/xorg.scm | 2 +-
63 files changed, 140 insertions(+), 140 deletions(-)
diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm
index 2b65a02242..9cfd12a1e6 100644
--- a/gnu/packages/abiword.scm
+++ b/gnu/packages/abiword.scm
@@ -95,7 +95,7 @@
("libchamplain" ,libchamplain)
("libglade" ,libglade)
("libgsf" ,libgsf)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("librsvg" ,librsvg)
("libxml2" ,libxml2)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 2b7cac7c16..c40529f817 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1722,7 +1722,7 @@ characters can be replaced as well, as can UTF-8 characters.")
;; FIXME: add reiserfs.
("zlib" ,zlib)
("e2fsprogs" ,e2fsprogs)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("ncurses" ,ncurses)))
(home-page "https://www.cgsecurity.org/wiki/TestDisk")
(synopsis "Data recovery tool")
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index a31ac8dab0..d3e4dfbd86 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -405,7 +405,7 @@ precision.")
("gsl" ,gsl)
("lapack" ,lapack)
("libao" ,ao)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libsamplerate" ,libsamplerate)
("libx11" ,libx11)
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index 08bf4eb1de..0357ac1190 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -112,7 +112,7 @@ C++ @dfn{Standard Template Library} (STL).")
`(("boost" ,boost)
("ffmpeg" ,ffmpeg)
("libdv" ,libdv)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libmng" ,libmng)
("zlib" ,zlib)))
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 3bb236fde9..2ac41e17a0 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -132,7 +132,7 @@ header.")
(inputs
`(("cfitsio" ,cfitsio)
("gsl" ,gsl)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff)
("wcslib" ,wcslib)
("zlib" ,zlib)))
@@ -218,7 +218,7 @@ objects.")
`(("glu" ,glu)
("glew" ,glew)
("libtheora" ,libtheora)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
;; maybe required?
("mesa" ,mesa)
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index b6bdf33eef..64aa38d785 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -459,7 +459,7 @@ capacity is user-selectable.")
("eudev" ,eudev)
("fontconfig" ,fontconfig)
("libexif" ,libexif)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("ffmpeg" ,ffmpeg-3.4)))
(native-inputs
`(("pkg-config" ,pkg-config)
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index e998c587ce..92b4a9133e 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1347,7 +1347,7 @@ applications. That is, compute distances and related measures for angular
(base32
"1a8mi70x79a691r40yiw684jkg1mr9n8agkxlcksxcnrdybs9c0x"))))
(build-system r-build-system)
- (inputs `(("libjpeg" ,libjpeg)))
+ (inputs `(("libjpeg" ,libjpeg-turbo)))
(home-page "http://www.rforge.net/jpeg/")
(synopsis "Read and write JPEG images with R")
(description "This package provides a way to read, write and display
@@ -9704,7 +9704,7 @@ redundant complex conjugate when the input is real data.")
(build-system r-build-system)
(inputs
`(("libtiff" ,libtiff)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("zlib" ,zlib)))
(home-page "http://www.rforge.net/tiff/")
(synopsis "Read and write TIFF images")
@@ -18295,7 +18295,7 @@ currently limited to 8 bit greyscale images and 24, 32 bit (A)RGB images.")
(properties `((upstream-name . "readbitmap")))
(build-system r-build-system)
(inputs
- `(("libjpeg" ,libjpeg)
+ `(("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)))
(propagated-inputs
`(("r-bmp" ,r-bmp)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 0adca9addb..0d6cb3c937 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -158,7 +158,7 @@
("ijs" ,ijs)
("dbus" ,dbus)
("lcms" ,lcms)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("glib" ,glib)
@@ -585,7 +585,7 @@ should only be used as part of the Guix cups-pk-helper service.")
(inputs
`(("cups-minimal" ,cups-minimal)
("dbus" ,dbus)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libusb" ,libusb)
("python" ,python)
("python-dbus" ,python-dbus)
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index bfe1a8f6dd..70caeab06d 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -244,7 +244,7 @@ GTK+, lets you select a desktop session and log in to it.")
(build-system cmake-build-system)
(inputs `(("linux-pam" ,linux-pam)
("libpng" ,libpng)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("freeglut" ,freeglut)
("libxrandr" ,libxrandr)
("libxrender" ,libxrender)
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 7f8aa42e95..683be7927a 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -290,7 +290,7 @@ designed to be used in a generic text renderer.")
("fribidi" ,fribidi)
("glib" ,glib)
("gtk+-2" ,gtk+-2)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("liblinebreak" ,liblinebreak)
("libxft" ,libxft)
("sqlite" ,sqlite)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ebe47d7186..3a39a51f81 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -173,7 +173,7 @@
("libxft" ,libxft)
("libtiff" ,libtiff)
("giflib" ,giflib)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("imagemagick" ,imagemagick)
("acl" ,acl)
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 121627dd88..3fc9d522f4 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -124,7 +124,7 @@
("harfbuzz" ,harfbuzz)
("luajit" ,luajit)
("libinput" ,libinput-minimal)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libsndfile" ,libsndfile)
("libtiff" ,libtiff)
diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm
index 40d5e7e513..204d2f8483 100644
--- a/gnu/packages/fltk.scm
+++ b/gnu/packages/fltk.scm
@@ -56,7 +56,7 @@
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
- `(("libjpeg" ,libjpeg)
+ `(("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libx11" ,libx11)
("libxft" ,libxft)
@@ -129,7 +129,7 @@ UI builder called FLUID that can be used to create applications in minutes.")
(assoc-ref outputs "out") "/lib"))
#t)))))
(inputs
- `(("libjpeg" ,libjpeg)
+ `(("libjpeg" ,libjpeg-turbo)
("glu" ,glu)
("waf" ,python-waf)))
;; ntk.pc lists "x11" and "xft" in Requires.private, and "cairo" in
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 22981b4fc0..1e5ebea868 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -600,7 +600,7 @@ definitions.")
("libSM" ,libsm)
("libX11" ,libx11)
("libXi" ,libxi)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libltdl" ,libltdl)
("libpng" ,libpng)
("libspiro" ,libspiro)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 79363f5662..a2f738c551 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -687,7 +687,7 @@ applications, X servers (rootless or fullscreen) or other display servers.")
("lcms" ,lcms)
("libevdev" ,libevdev)
("libinput" ,libinput-minimal)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libunwind" ,libunwind)
("libva" ,libva)
("libwebp" ,libwebp)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 23cf913644..e58d1642e2 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -527,7 +527,7 @@ clone.")
("xcb-util-image" ,xcb-util-image)
("libxrandr" ,libxrandr)
("eudev" ,eudev)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libsndfile" ,libsndfile)
("stb-image" ,stb-image)
("stb-image-write" ,stb-image-write)))
@@ -746,7 +746,7 @@ etc.")
("freetype" ,freetype)
("glu" ,glu)
("gtk" ,gtk+-2)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtheora" ,libtheora)
("libvorbis" ,libvorbis)
@@ -828,7 +828,7 @@ etc.")
("curl" ,curl)
("freetype" ,freetype)
("giflib" ,giflib)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libwebp" ,libwebp)
("libx11" ,libx11)
@@ -980,7 +980,7 @@ interface (API).")
("sdl-mixer" ,sdl-mixer)
("sdl-ttf" ,sdl-ttf)
("sdl-gfx" ,sdl-gfx)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libX11" ,libx11)
("libsmpeg" ,libsmpeg)
@@ -1663,7 +1663,7 @@ scripted in a Python-like language.")
("libxft" ,libxft)
("libxinerama" ,libxinerama)
("libfontconfig" ,fontconfig)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("fltk" ,fltk)
("zlib" ,zlib)))
@@ -1835,7 +1835,7 @@ of the others")
(build-system gnu-build-system)
(inputs
`(("sdl2" ,sdl2)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("openal" ,openal)
("curl" ,curl)
("opusfile" ,opusfile)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index a7674977c8..e3b3a5f6e5 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -235,7 +235,7 @@
`(("expat" ,expat)
("freeglut" ,freeglut)
("glu" ,glu)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libogg" ,libogg)
("libtiff" ,libtiff)
("libvorbis" ,libvorbis)
@@ -627,7 +627,7 @@ effects and music to make a completely free game.")
`(("pkg-config" ,pkg-config)))
(inputs
`(("glu" ,glu)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libogg" ,libogg)
("libpng" ,libpng)
("libvorbis" ,libvorbis)
@@ -1864,7 +1864,7 @@ are primarily in English, however some in other languages are provided.")
#:make-flags '("CC=gcc" "sharedlib")))
(inputs
`(("bzip2" ,bzip2)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libx11" ,libx11)
("libxxf86vm" ,libxxf86vm)
@@ -2017,7 +2017,7 @@ match, cannon keep, and grave-itation pit.")
("gmp" ,gmp)
("irrlicht" ,irrlicht)
("jsoncpp" ,jsoncpp)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libogg" ,libogg)
("libvorbis" ,libvorbis)
@@ -2259,7 +2259,7 @@ games using Python as well as C++.")
`(("pkg-config" ,pkg-config)))
(inputs
`(("freetype" ,freetype)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libsndfile" ,libsndfile)
("libxml2" ,libxml2)
@@ -2384,7 +2384,7 @@ This game is based on the GPL version of the famous game TuxRacer.")
("curl" ,curl)
;; The following input is needed to build the bundled and modified
;; version of irrlicht.
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("openssl" ,openssl)
("enet" ,enet)))
(native-inputs
@@ -5718,7 +5718,7 @@ You can save humanity and get programming skills!")
("fluidsynth" ,fluidsynth-1) ;XXX: try using 2.x when updating
("gtk+3" ,gtk+)
("libgme" ,libgme)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libsndfile" ,libsndfile)
("mesa" ,mesa)
("mpg123" ,mpg123)
@@ -6113,7 +6113,7 @@ quotation from a collection of quotes.")
`(("xonotic-data" ,xonotic-data)
("alsa-lib" ,alsa-lib)
("curl" ,curl)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libmodplug" ,libmodplug)
("libvorbis" ,libvorbis)
("libogg" ,libogg)
@@ -9518,7 +9518,7 @@ This package is part of the KDE games module.")
`(("curl" ,curl)
("font-dejavu" ,font-dejavu)
("glu" ,glu)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libxdg-basedir" ,libxdg-basedir)
("libxml2" ,libxml2)
diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm
index 6afccb7b0c..e336282546 100644
--- a/gnu/packages/gd.scm
+++ b/gnu/packages/gd.scm
@@ -83,7 +83,7 @@
("zlib" ,zlib)))
(propagated-inputs
`(("fontconfig" ,fontconfig)
- ("libjpeg" ,libjpeg)))
+ ("libjpeg" ,libjpeg-turbo)))
(home-page "http://www.libgd.org/")
(synopsis "Library for the dynamic creation of images by programmers")
(description
@@ -114,7 +114,7 @@ most common applications of GD involve website development.")
("freetype" ,freetype)
("gd" ,gd)
("libpng" ,libpng)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("zlib" ,zlib)))
(arguments
`(#:make-maker-flags
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index c63fc2f9f9..1ceb99015f 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -60,7 +60,7 @@
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--disable-static")))
- (inputs `(("libjpeg" ,libjpeg)
+ (inputs `(("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff)
("zlib" ,zlib)))
(synopsis "Little CMS, a small-footprint colour management engine")
@@ -277,14 +277,14 @@ printing, and psresize, for adjusting page sizes.")
;; these libraries.
,@(if (%current-target-system)
`(("zlib/native" ,zlib)
- ("libjpeg/native" ,libjpeg))
+ ("libjpeg/native" ,libjpeg-turbo))
'())))
(inputs
`(("fontconfig" ,fontconfig)
("freetype" ,freetype)
("gs-fonts" ,gs-fonts)
("jbig2dec" ,jbig2dec)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpaper" ,libpaper)
("libpng" ,libpng)
("libtiff" ,libtiff)
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 42a55cff33..e95251cc79 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -117,7 +117,7 @@ provided, as well as a framework to add new color models and data types.")
`(("cairo" ,cairo)
("pango" ,pango)
("libpng" ,libpng)
- ("libjpeg" ,libjpeg)))
+ ("libjpeg" ,libjpeg-turbo)))
(native-inputs
`(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ; for gtester
@@ -174,7 +174,7 @@ buffers.")
("glib" ,glib)
("glib-networking" ,glib-networking)
("libtiff" ,libtiff)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("atk" ,atk)
("gexiv2" ,gexiv2)
("gtk+" ,gtk+-2)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e48bb81401..10e2274a83 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2803,7 +2803,7 @@ creating interactive structured graphics.")
("libgnome" ,libgnome)
("libgnomecanvas" ,libgnomecanvas)
("libgnome-keyring" ,libgnome-keyring)))
- (inputs `(("libjpeg" ,libjpeg)
+ (inputs `(("libjpeg" ,libjpeg-turbo)
("popt" ,popt)
("libbonobo" ,libbonobo)
("libxml2" ,libxml2)
@@ -5137,7 +5137,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.")
("lcms" ,lcms)
("libexif" ,libexif)
("libpeas" ,libpeas)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("librsvg" ,librsvg)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gtk+" ,gtk+)))
@@ -7509,7 +7509,7 @@ shared object databases, search tools and indexing.")
("libgsf" ,libgsf)
("libgxps" ,libgxps)
("libiptcdata" ,libiptcdata)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libosinfo" ,libosinfo)
("libpng" ,libpng)
("libseccomp" ,libseccomp)
@@ -9435,7 +9435,7 @@ functionality.")
("clutter" ,clutter)
("clutter-gst" ,clutter-gst)
("clutter-gtk" ,clutter-gtk)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff)
("libraw" ,libraw)))
(home-page "https://wiki.gnome.org/Apps/Gthumb")
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 43605dfc86..d026c67992 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -101,7 +101,7 @@
("gtk+" ,gtk+)
("libarchive" ,libarchive)
("libgsf" ,libgsf)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libltdl" ,libltdl)
("libmpeg2" ,libmpeg2)
("libmp4v2" ,libmp4v2)
diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm
index dd7c67d553..ff2145a25e 100644
--- a/gnu/packages/gnustep.scm
+++ b/gnu/packages/gnustep.scm
@@ -139,7 +139,7 @@ to easily create cross-compiled binaries.")
("libx11" ,libx11)
("libxinerama" ,libxinerama)
("fontconfig" ,fontconfig)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("giflib" ,giflib)
("libpng" ,libpng)
("libtiff" ,libtiff)))
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 3ef420cf05..7211e1246a 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -153,7 +153,7 @@
("opensubdiv" ,opensubdiv)
("ilmbase" ,ilmbase)
("openjpeg" ,openjpeg)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("ffmpeg" ,ffmpeg)
@@ -241,7 +241,7 @@ application can be customized via its API for Python scripting.")
("openexr" ,openexr)
("ilmbase" ,ilmbase)
("openjpeg" ,openjpeg-1)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("ffmpeg" ,ffmpeg)
@@ -495,7 +495,7 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.")
(inputs
`(("boost" ,boost)
("libpng" ,libpng)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff)
("giflib" ,giflib)
("openexr" ,openexr)
@@ -558,7 +558,7 @@ visual effects work for film.")
("unzip" ,unzip)))
(inputs
`(("giflib" ,giflib)
- ("libjpeg" ,libjpeg) ; Required for the JPEG texture plugin.
+ ("libjpeg" ,libjpeg-turbo) ; Required for the JPEG texture plugin.
("jasper" ,jasper)
("librsvg" ,librsvg)
("libxrandr" ,libxrandr)
@@ -597,7 +597,7 @@ virtual reality, scientific visualization and modeling.")
"-DCMAKE_CXX_FLAGS=-fpermissive"
,flags))))
(inputs
- `(("libjpeg" ,libjpeg)
+ `(("libjpeg" ,libjpeg-turbo)
,@(package-inputs openscenegraph)))))
@@ -662,7 +662,7 @@ virtual reality, scientific visualization and modeling.")
("pkg-config" ,pkg-config)))
(inputs
`(("boost" ,boost)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("openexr" ,openexr)
@@ -1014,7 +1014,7 @@ your terminal.")
`(("imagemagick" ,imagemagick)
("lcms" ,lcms)
("fbida" ,fbida)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("zip" ,zip)
("perl" ,perl)
("perl-cpanel-json-xs" ,perl-cpanel-json-xs)
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index 5ef0fd0344..406375b3d6 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -104,7 +104,7 @@
("libltdl" ,libltdl)
("libXaw" ,libxaw)
("expat" ,expat)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)))
(native-inputs
`(("bison" ,bison)
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 63b4179bc6..1b519de5c6 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -244,7 +244,7 @@ for the GStreamer multimedia library.")
("libcaca" ,libcaca)
("libdv" ,libdv)
("libiec61883" ,libiec61883)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libshout" ,libshout)
("libsoup" ,libsoup)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 77f968f77b..43baf01e3d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -531,7 +531,7 @@ highlighting and other features typical of a source code editor.")
;; Used for testing and required at runtime.
("shared-mime-info" ,shared-mime-info)))
(inputs
- `(("libjpeg" ,libjpeg)
+ `(("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff)
("libx11" ,libx11)))
(native-inputs
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index f5d67c8917..cdaf8e86e2 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -89,7 +89,7 @@
(inputs
`(;; Our ICU is too recent: “error: ‘UChar’ does not name a type“.
;; ("icu4c" ,icu4c)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("libxml2" ,libxml2)
@@ -137,7 +137,7 @@ licences similar to the Modified BSD licence."))))
("gts" ,gts)
("hdf5" ,hdf5)
("itpp" ,itpp)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("libxml" ,libxml2)
@@ -198,7 +198,7 @@ of external libraries that provide additional functionality.")
("expat" ,expat)
("freetype" ,freetype)
("hdf5" ,hdf5)
- ("jpeg" ,libjpeg)
+ ("jpeg" ,libjpeg-turbo)
("jsoncpp" ,jsoncpp)
("libogg" ,libogg)
("libtheora" ,libtheora)
@@ -393,7 +393,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
(patches (search-patches "opencv-rgbd-aarch64-test-fix.patch"))
(sha256
(base32 "1f334glf39nk42mpqq6j732h3ql2mpz89jd4mcl678s8n73nfjh2"))))))
- (inputs `(("libjpeg" ,libjpeg)
+ (inputs `(("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("jasper" ,jasper)
;; ffmpeg 4.0 causes core dumps in tests.
@@ -454,7 +454,7 @@ vision algorithms. It can be used to do things like:
("gobject-introspection" ,gobject-introspection)))
(inputs
`(("glib" ,glib)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("librsvg" ,librsvg)
("libtiff" ,libtiff)
@@ -516,7 +516,7 @@ due to its architecture which automatically parallelises the image workflows.")
("gtk+-2" ,gtk+-2)
("libxml2" ,libxml2)
("libexif" ,libexif)
- ("libjpeg" ,libjpeg) ; required by vips.pc
+ ("libjpeg" ,libjpeg-turbo) ;required by vips.pc
("librsvg" ,librsvg)
("fftw" ,fftw)
("libgsf" ,libgsf)
@@ -573,7 +573,7 @@ recalculates.")
(inputs
`(("libgeotiff" ,libgeotiff)
("libtiff" ,libtiff)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("zlib" ,zlib)))
(home-page "https://github.com/vxl/vxl/")
@@ -650,7 +650,7 @@ libraries designed for computer vision research and implementation.")
("fftw" ,fftw)
("fftwf" ,fftwf)
("hdf5" ,hdf5)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("mesa" ,mesa-opencl)
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index eef2866b4b..c43f132ae0 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -198,7 +198,7 @@ collection. Geeqie was initially based on GQview.")
"0hi9v0rdx47nys0wvm9xasdrafa34r5kq6crb074a0ipwmc60iiq"))))
(build-system gnu-build-system)
(inputs `(("gtk+" ,gtk+-2)
- ("libjpeg" ,libjpeg)))
+ ("libjpeg" ,libjpeg-turbo)))
(native-inputs `(("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(synopsis "Simple and fast image viewer for X")
@@ -376,7 +376,7 @@ It supports JPEG, PNG and GIF formats.")
("zlib" ,zlib)
("exiv2" ,exiv2)
("libpng" ,libpng)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("lcms" ,lcms)
("openexr" ,openexr)
("fftw" ,fftwf)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 247fb94adf..65acf7638f 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -499,7 +499,7 @@ official designation is ISO/IEC 29199-2). This library is an implementation of t
(sha256 (base32
"1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8"))))
(build-system gnu-build-system)
- (inputs `(("libjpeg" ,libjpeg)))
+ (inputs `(("libjpeg" ,libjpeg-turbo)))
(arguments
'(#:tests? #f)) ; no tests
(synopsis "Optimize JPEG images")
@@ -564,7 +564,7 @@ extracting icontainer icon files.")
,name "-" ,version)
"--disable-static")))
(inputs `(("zlib" ,zlib)
- ("libjpeg" ,libjpeg)))
+ ("libjpeg" ,libjpeg-turbo)))
(synopsis "Library for handling TIFF files")
(description
"Libtiff provides support for the Tag Image File Format (TIFF), a format
@@ -597,7 +597,7 @@ collection of tools for doing simple manipulations of TIFF images.")
("pkg-config" ,pkg-config)))
(inputs
`(("giflib" ,giflib)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("libwebp" ,libwebp)))
@@ -871,7 +871,7 @@ compose, and analyze GIF images.")
("freetype" ,freetype)
("giflib" ,giflib)
("libid3tag" ,libid3tag)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("libx11" ,libx11)
@@ -982,7 +982,7 @@ supplies a generic doubly-linked list and some string functions.")
`(("pkg-config" ,pkg-config)
("unzip" ,unzip)))
(inputs
- `(("libjpeg" ,libjpeg)
+ `(("libjpeg" ,libjpeg-turbo)
("libjxr" ,libjxr)
("libpng" ,libpng)
("libraw" ,libraw)
@@ -1019,7 +1019,7 @@ graphics image formats like PNG, BMP, JPEG, TIFF and others.")
("hdf5" ,hdf5)
("ilmbase" ,ilmbase) ; propagated by openexr, but needed explicitly
; to create a configure-flag
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("openexr" ,openexr)
@@ -1123,7 +1123,7 @@ language bindings to VIGRA.")
(inputs
`(("freeglut" ,freeglut)
("giflib" ,giflib)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)))
(native-inputs
@@ -1163,7 +1163,7 @@ channels.")
(propagated-inputs
;; These are all in the 'Libs.private' field of libmng.pc.
`(("lcms" ,lcms)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("zlib" ,zlib)))
(home-page "http://www.libmng.com/")
(synopsis "Library for handling MNG files")
@@ -1279,7 +1279,7 @@ convert, manipulate, filter and display a wide variety of image formats.")
(base32
"05l75yd1zsxwv25ykwwwjs8961szv7iywf16nc6vc6qpby27ckv6"))))
(build-system cmake-build-system)
- (inputs `(("libjpeg" ,libjpeg)))
+ (inputs `(("libjpeg" ,libjpeg-turbo)))
(synopsis "JPEG-2000 library")
(description "The JasPer Project is an initiative to provide a reference
implementation of the codec specified in the JPEG-2000 Part-1 standard (i.e.,
@@ -1367,7 +1367,7 @@ differences in file encoding, image quality, and other small variations.")
(inputs
`(("libmhash" ,libmhash)
("libmcrypt" ,libmcrypt)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("zlib" ,zlib)))
(arguments
`(#:make-flags '("CXXFLAGS=-fpermissive") ;required for MHashPP.cc
@@ -1733,7 +1733,7 @@ identical visual appearance.")
(build-system gnu-build-system)
(inputs
`(("curl" ,curl)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("ncurses" ,ncurses)))
(home-page "https://csl.name/jp2a/")
(synopsis "Convert JPEG images to ASCII")
diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index e6a178713a..2f38fafe3a 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -101,7 +101,7 @@
("libxml2" ,libxml2)
("libtiff" ,libtiff)
("libpng" ,libpng)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("pango" ,pango)
("freetype" ,freetype)
("bzip2" ,bzip2)
@@ -203,7 +203,7 @@ script.")
("libxml2" ,libxml2)
("libtiff" ,libtiff)
("libpng" ,libpng)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("freetype" ,freetype)
("bzip2" ,bzip2)
("xz" ,xz)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index c4cbcbdc1b..9d7991316f 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -950,7 +950,7 @@ machine.")))
("grep" ,grep)
("jamvm" ,jamvm)
("lcms" ,lcms)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libnsl" ,libnsl)
("libpng" ,libpng)
("libtool" ,libtool)
@@ -1570,7 +1570,7 @@ bootstrapping purposes.")
("libxi" ,libxi)
("libxinerama" ,libxinerama)
("libxrender" ,libxrender)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("mit-krb5" ,mit-krb5)
("nss" ,nss)
@@ -1867,7 +1867,7 @@ new Date();"))
("giflib" ,giflib)
("lcms" ,lcms)
("libelf" ,libelf)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libice" ,libice)
("libpng" ,libpng)
("libx11" ,libx11)
@@ -2145,7 +2145,7 @@ new Date();"))
("freetype" ,freetype)
("giflib" ,giflib)
("lcms" ,lcms)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libx11" ,libx11)
("libxext" ,libxext)
@@ -2192,7 +2192,7 @@ new Date();"))
("freetype" ,freetype)
("giflib" ,giflib)
("lcms" ,lcms)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libx11" ,libx11)
("libxext" ,libxext)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 9230bb71c0..fd1b6ec7ca 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3768,7 +3768,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.")
("kwidgetsaddons" ,kwidgetsaddons)
("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("openssl" ,openssl)
("phonon" ,phonon)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index bc61e96d19..c74d4e0532 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -419,7 +419,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
("libcdio" ,libcdio)
("libdrm" ,libdrm)
("libgcrypt" ,libgcrypt)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libltdl" ,libltdl)
("libmad" ,libmad)
("libmicrohttpd" ,libmicrohttpd)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 719401d69a..d92a74efa8 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -778,7 +778,7 @@ than 8 bits, and at the end only some significant 8 bits are kept.")
(inputs
`(("giflib" ,giflib)
("lapack" ,lapack)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libx11" ,libx11)
("openblas" ,openblas)
@@ -1746,7 +1746,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n")))
("eigen" ,eigen-for-tensorflow)
("gemmlowp" ,gemmlowp-for-tensorflow)
("lmdb" ,lmdb)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("giflib" ,giflib)
("grpc" ,grpc)
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index fa95d0bf66..5c9da6d72b 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -808,7 +808,7 @@ infamous 'Wanda the Fish'.")
("libice" ,libice)
("libsm" ,libsm)
("libgxps" ,libgxps)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libxml2" ,libxml2)
("dogtail" ,python2-dogtail)
("shared-mime-info" ,shared-mime-info)
@@ -1344,7 +1344,7 @@ can be used as backgrounds in the MATE Desktop environment.")
("libpeas" ,libpeas)
("libxml2" ,libxml2)
("libexif" ,libexif)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("librsvg" ,librsvg)
("lcms" ,lcms)
("mate-desktop" ,mate-desktop)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index cbb1112d9f..81835115ef 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -725,7 +725,7 @@ computations.")
("flex" ,flex)))
(inputs
`(("zlib" ,zlib)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libtirpc" ,libtirpc)))
(arguments
`(#:parallel-tests? #f
@@ -965,7 +965,7 @@ extremely large and complex data collections.")
`(("hdf4" ,hdf4)
("hdf5" ,hdf5)
("zlib" ,zlib)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("slf4j-api" ,java-slf4j-api)))
(arguments
`(#:configure-flags
@@ -1082,7 +1082,7 @@ implemented in C.")
`(("hdf4" ,hdf4-alt) ; assume most HDF-EOS2 users won't use the HDF4 netCDF API
;; XXX: These inputs are really dependencies of hdf4.
("zlib" ,zlib)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libtirpc" ,libtirpc)
("gctp" ,gctp)))
@@ -1242,7 +1242,7 @@ similar to MATLAB, GNU Octave or SciPy.")
`(("hdf4" ,hdf4-alt)
("hdf5" ,hdf5)
("zlib" ,zlib)
- ("libjpeg" ,libjpeg)))
+ ("libjpeg" ,libjpeg-turbo)))
(arguments
`(#:configure-flags '("--enable-doxygen" "--enable-dot" "--enable-hdf4")
diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm
index 7fe0503d6f..aac6f13379 100644
--- a/gnu/packages/netpbm.scm
+++ b/gnu/packages/netpbm.scm
@@ -102,7 +102,7 @@
(build-system gnu-build-system)
(inputs `(("ghostscript" ,ghostscript)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("libxml2" ,libxml2)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 32a45ed4d5..8451390647 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -433,7 +433,7 @@ using the DjVuLibre library.")
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs
`(("jbig2dec" ,jbig2dec)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("mujs" ,mujs)
("mupdf" ,mupdf)
("openjpeg" ,openjpeg)
@@ -573,7 +573,7 @@ interaction.")
`(("cppunit" ,cppunit)
("pkg-config" ,pkg-config)))
(inputs
- `(("libjpeg" ,libjpeg)
+ `(("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
@@ -632,7 +632,7 @@ extracting content or merging files.")
("freetype" ,freetype)
("harfbuzz" ,harfbuzz)
("jbig2dec" ,jbig2dec)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libx11" ,libx11)
("libxext" ,libxext)
("mujs" ,mujs)
@@ -859,7 +859,7 @@ the PDF pages.")
#:tests? #f
#:make-flags (list "CC=gcc"
(string-append "prefix=" (assoc-ref %outputs "out")))))
- (inputs `(("libjpeg" ,libjpeg)
+ (inputs `(("libjpeg" ,libjpeg-turbo)
("curl" ,curl)
("libtiff" ,libtiff)
("libudev" ,eudev)
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 0867433245..0dfc442883 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -82,7 +82,7 @@
(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")
@@ -258,7 +258,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)))
@@ -300,7 +300,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)
@@ -394,7 +394,7 @@ photographic equipment.")
("pugixml" ,pugixml)
("gtk+" ,gtk+)
("sqlite" ,sqlite)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("cairo" ,cairo)
("lcms" ,lcms)
@@ -450,7 +450,7 @@ and enhance them.")
("freeglut" ,freeglut)
("glew" ,glew)
("lcms" ,lcms)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpano13" ,libpano13)
("libpng" ,libpng)
("libtiff" ,libtiff)
@@ -535,7 +535,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++)
diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm
index ca280f77fa..f8ea6194c6 100644
--- a/gnu/packages/prolog.scm
+++ b/gnu/packages/prolog.scm
@@ -137,7 +137,7 @@ manner. It also features an interactive interpreter.")
("texinfo" ,texinfo)
("libarchive" ,libarchive)
("libunwind" ,libunwind)
- ("libjpeg", libjpeg)
+ ("libjpeg", libjpeg-turbo)
("libxft" ,libxft)
("fontconfig" ,fontconfig)
("perl" ,perl)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 15a7dd1b8a..e6ef0495b4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -440,7 +440,7 @@ Expressions are constructed from parsed strings or directly in Python.")
(propagated-inputs `(("numpy" ,python-numpy)))
(inputs
`(("hdf4" ,hdf4)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("zlib" ,zlib)))
(arguments
`(#:phases
@@ -4434,7 +4434,7 @@ the OleFileIO module from PIL, the Python Image Library.")
(inputs
`(("freetype" ,freetype)
("lcms" ,lcms)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff)
("libwebp" ,libwebp)
("openjpeg" ,openjpeg)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4e6966d007..4011970643 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -378,7 +378,7 @@ developers using C++ or QML, a CSS & JavaScript like language.")
("harfbuzz" ,harfbuzz)
("icu4c" ,icu4c)
("libinput" ,libinput-minimal)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libmng" ,libmng)
("libpng" ,libpng)
("libx11" ,libx11)
@@ -2385,7 +2385,7 @@ different kinds of sliders, and much more.")
`(("icu" ,icu4c)
("glib" ,glib)
("gst-plugins-base" ,gst-plugins-base)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libwebp" ,libwebp)
("sqlite" ,sqlite)
diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index 71464237f4..2e364b2b8e 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -103,7 +103,7 @@ to remotely control a user's Windows desktop.")
`(("alsa-lib" ,alsa-lib)
("cups" ,cups)
("ffmpeg" ,ffmpeg)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libx11" ,libx11)
("libxkbcommon" ,libxkbcommon)
("libxkbfile" ,libxkbfile)
diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm
index 98f7fd203a..8e57cb20eb 100644
--- a/gnu/packages/scanner.scm
+++ b/gnu/packages/scanner.scm
@@ -123,7 +123,7 @@ package contains the library, but no drivers.")
(name "sane-backends")
(inputs
`(("hplip" ,(@ (gnu packages cups) hplip-minimal))
- ("libjpeg" ,libjpeg) ; wanted by pixma, epsonds, others
+ ("libjpeg" ,libjpeg-turbo) ; wanted by pixma, epsonds, others
("libpng" ,libpng) ; support ‘scanimage --format=png’
,@(package-inputs sane-backends-minimal)))
(arguments
@@ -219,7 +219,7 @@ package contains the library and drivers.")))
(inputs
`(("gtk+" ,gtk+-2)
("lcms" ,lcms)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff)
("sane-backends" ,sane-backends)
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index b0da2ac36b..44eab98fba 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -533,7 +533,7 @@ implementation techniques and as an expository tool.")
("glu" ,glu)
("gmp" ,gmp)
("gtk+" ,gtk+) ; propagates gdk-pixbuf+svg
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libx11" ,libx11)
("mesa" ,mesa)
diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm
index e9c998c7b6..385017f2c2 100644
--- a/gnu/packages/scribus.scm
+++ b/gnu/packages/scribus.scm
@@ -87,7 +87,7 @@
("lcms" ,lcms)
("libcdr" ,libcdr)
("libfreehand" ,libfreehand)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libmspub" ,libmspub)
("libpagemaker" ,libpagemaker)
("librevenge" ,librevenge)
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index a01cafb34a..b133227629 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -238,7 +238,7 @@ other supporting functions for SDL.")
;; propagated input because the pkg-config file refers to SDL's pkg-config
;; file.
(propagated-inputs `(("sdl" ,sdl)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("libwebp" ,libwebp)))
@@ -507,7 +507,7 @@ directory.")
`(("pkg-config" ,pkg-config)
;; Required by test suite.
("xorg-server" ,xorg-server)
- ("libjpeg" ,libjpeg)))
+ ("libjpeg" ,libjpeg-turbo)))
(inputs
`(("guile" ,guile-2.2)
("sdl-union" ,(sdl-union))))
diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index a57e0151ca..12461914bc 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -146,7 +146,7 @@ which allows users to view a desktop computing environment.")
("gobject-introspection" ,gobject-introspection)
("json-glib" ,json-glib)
("libepoxy" ,libepoxy)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libxcb" ,libxcb)
("lz4" ,lz4)
("mesa" ,mesa)
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index ec2994dc33..a9e17ff2e5 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -343,7 +343,7 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\
("openblas" ,openblas)
("gfortran" ,gfortran)
("icu4c" ,icu4c)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libtiff" ,libtiff)
("libxt" ,libxt)
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index c88d0338cb..f17e138bdb 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -232,7 +232,7 @@ interfaces (GUIs) in the Tcl language.")
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("libx11" ,libx11)
("libpng" ,libpng)
- ("libjpeg" ,libjpeg)))
+ ("libjpeg" ,libjpeg-turbo)))
(arguments
`(#:make-maker-flags `(,(string-append
"X11=" (assoc-ref %build-inputs "libx11")))
diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm
index 8f3c887a68..c7ad33c17b 100644
--- a/gnu/packages/upnp.scm
+++ b/gnu/packages/upnp.scm
@@ -144,7 +144,7 @@ and others.")
("gettext" ,gettext-minimal)))
(inputs
`(("libexif" ,libexif)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libid3tag" ,libid3tag)
("flac" ,flac)
("libvorbis" ,libvorbis)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 5629d58b96..6c4a7948a2 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1281,7 +1281,7 @@ streaming protocols.")
("libass" ,libass)
("libdvdcss" ,libdvdcss)
("libdvdnav" ,libdvdnav)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libmpeg2" ,libmpeg2)
("libmpg123" ,mpg123) ; audio codec for MP3
("libpng" ,libpng)
@@ -1379,7 +1379,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
("libcdio-paranoia" ,libcdio-paranoia)
("libdvdread" ,libdvdread)
("libdvdnav" ,libdvdnav)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libva" ,libva)
("libvdpau" ,libvdpau)
("libx11" ,libx11)
@@ -2328,7 +2328,7 @@ tools, XML authoring components, and an extensible plug-in based API.")
(inputs
`(("alsa-lib" ,alsa-lib)
("glu" ,glu)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libx11" ,libx11)
("qtbase" ,qtbase)
("eudev" ,eudev)))
@@ -3330,7 +3330,7 @@ It counts more than 100 plugins.")
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
(inputs
- `(("libjpeg" ,libjpeg)
+ `(("libjpeg" ,libjpeg-turbo)
("ffmpeg" ,ffmpeg-3.4)
("libmicrohttpd" ,libmicrohttpd)
("sqlite" ,sqlite)))
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index f55ee111f8..037de68bcb 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -78,7 +78,7 @@
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("fltk" ,fltk)
("fontconfig" ,fontconfig)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libxcursor" ,libxcursor)
("libxft" ,libxft)
@@ -126,7 +126,7 @@ older or slower computers and embedded systems.")
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("zlib" ,zlib)
("openssl" ,openssl)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff)
("libevent" ,libevent)
("libpng" ,libpng)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index b22f2776b2..a4373193bf 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4956,7 +4956,7 @@ w3c webidl files and a binding configuration file.")
("openssl" ,openssl)
("utf8proc" ,utf8proc)
("libpng" ,libpng)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libcss" ,libcss)
("libdom" ,libdom)
("libnsbmp" ,libnsbmp)
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 5101ceb2ea..3d367aa54f 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -207,7 +207,7 @@ engine that uses Wayland for graphics output.")
("hyphen" ,hyphen)
("icu4c" ,icu4c)
("libgcrypt" ,libgcrypt)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libnotify" ,libnotify)
("libpng" ,libpng)
("libseccomp" ,libseccomp)
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 258980803a..0700fdce20 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -111,7 +111,7 @@
("libsane" ,sane-backends)
("libpcap" ,libpcap)
("libpng" ,libpng)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff)
("libICE" ,libice)
("libX11" ,libx11)
diff --git a/gnu/packages/wv.scm b/gnu/packages/wv.scm
index 866cfee222..37881a4d0f 100644
--- a/gnu/packages/wv.scm
+++ b/gnu/packages/wv.scm
@@ -45,7 +45,7 @@
(inputs
`(("glib" ,glib)
("libgsf" ,libgsf)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("zlib" ,zlib)))
(native-inputs
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index 48e6c31f6c..c2eedad5cb 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -67,7 +67,7 @@
;; XXX gstreamer-0.10 builds fail
;; ("gstreamer" ,gstreamer-0.10)
("gtk" ,gtk+)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libmspack" ,libmspack)
("libsm" ,libsm)
("libtiff" ,libtiff)
@@ -114,7 +114,7 @@ and many other languages.")
(base32 "1gjs9vfga60mk4j4ngiwsk9h6c7j22pw26m3asxr1jwvqbr8kkqk"))))
(inputs
`(("gtk" ,gtk+-2)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff)
("libmspack" ,libmspack)
("sdl" ,sdl)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 067278d9b9..feacb1942e 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1239,7 +1239,7 @@ protocol.")
("libglade" ,libglade)
("libxml2" ,libxml2)
("libsm" ,libsm)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("linux-pam" ,linux-pam)
("pango" ,pango)
("gtk+" ,gtk+)
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 7489624646..ff3d6c9ece 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -289,7 +289,7 @@ merging features essential for loading menus modified with menu editors.")
("gdk-pixbuf" ,gdk-pixbuf)
("cairo" ,cairo) ;; Needed for pdf thumbnails (poppler-glibc.pc)
("freetype" ,freetype)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libgsf" ,libgsf)
("poppler" ,poppler)
;; FIXME Provide gstreamer and gstreamer-tag to get video thumbnails
diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm
index 09c7597761..c3d02619b4 100644
--- a/gnu/packages/xfig.scm
+++ b/gnu/packages/xfig.scm
@@ -47,7 +47,7 @@
`(("desktop-file-utils" ,desktop-file-utils)))
(inputs
`(("libxaw3d" ,libxaw3d)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libxpm" ,libxpm)
("libx11" ,libx11)
@@ -90,7 +90,7 @@ selected in various ways. For text, 35 fonts are available.")
("makedepend" ,makedepend)))
(inputs
`(("xfig" ,xfig)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libxpm" ,libxpm)
("libx11" ,libx11)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index c7b4c8299b..67bfbf735f 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6129,7 +6129,7 @@ basic eye-candy effects.")
(inputs `(("ffmpeg" ,ffmpeg)
("flac" ,flac)
("gtk+-2" ,gtk+-2) ;; no full GTK3 support yet
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libvpx" ,libvpx)
("libx264" ,libx264)
--
2.24.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#39197] [PATCH core-updates 4/4] gnu: Deprecate the 'libjpeg' variable.
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 1/4] gnu: RHash: Do not use git-fetch, but provide a fallback URL Marius Bakke
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 2/4] gnu: cmake-minimal: Build with a minimal variant of cURL Marius Bakke
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 3/4] gnu: Replace uses of 'libjpeg' with 'libjpeg-turbo' Marius Bakke
@ 2020-01-19 23:20 ` Marius Bakke
2 siblings, 0 replies; 7+ messages in thread
From: Marius Bakke @ 2020-01-19 23:20 UTC (permalink / raw)
To: 39197
* gnu/packages/image.scm (libjpeg, libjpeg-8): Rename to ...
(ijg-libjpeg, ijg-libjpeg-8): ... this.
(libjpeg): Define as deprecated by LIBJPEG-TURBO.
* gnu/packages/emulators.scm (mame)[inputs]: Change from LIBJPEG-8 to
IJG-LIBJPEG-8.
* gnu/packages/games.scm (stepmania)[inputs]: Likewise.
* gnu/packages/qt.scm (qt-4)[inputs]: Likewise.
---
gnu/packages/emulators.scm | 2 +-
gnu/packages/games.scm | 2 +-
gnu/packages/image.scm | 9 ++++++---
gnu/packages/qt.scm | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index ffcdc65265..aba5ce4ff4 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1425,7 +1425,7 @@ play them on systems for which they were never designed!")
("flac" ,flac)
("fontconfig" ,fontconfig)
("glm" ,glm)
- ("libjpeg" ,libjpeg-8) ;jpeg_read_header argument error in libjpeg-9
+ ("libjpeg" ,ijg-libjpeg-8) ;jpeg_read_header argument error in libjpeg-9
("libxi" ,libxi)
("libxinerama" ,libxinerama)
("lua" ,lua)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index e3b3a5f6e5..ae97f05b0d 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -6566,7 +6566,7 @@ civilized than your own.")
("gtk+" ,gtk+-2)
("jsoncpp" ,jsoncpp)
("libpng" ,libpng)
- ("libjpeg" ,libjpeg-8)
+ ("libjpeg" ,ijg-libjpeg-8)
("libmad" ,libmad)
("libogg" ,libogg)
("libva" ,libva)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 65acf7638f..a7e207e07a 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -82,6 +82,7 @@
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix build-system scons)
+ #:use-module (guix deprecation)
#:use-module (srfi srfi-1))
(define-public libpng
@@ -363,7 +364,7 @@ Features:
@end enumerate")
(license license:gpl3+)))
-(define-public libjpeg
+(define-public ijg-libjpeg
(package
(name "libjpeg")
(version "9c")
@@ -392,8 +393,8 @@ lossless JPEG manipulations such as rotation, scaling or cropping:
(license license:ijg)
(home-page "https://www.ijg.org/")))
-(define-public libjpeg-8
- (package (inherit libjpeg)
+(define-public ijg-libjpeg-8
+ (package (inherit ijg-libjpeg)
(version "8d")
(source (origin
(method url-fetch)
@@ -1522,6 +1523,8 @@ 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)
+
(define-public niftilib
(package
(name "niftilib")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4011970643..a105ba9c1f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -215,7 +215,7 @@ system, and the core design of Django is reused in Grantlee.")
("xcb-util-renderutil" ,xcb-util-renderutil)
("xcb-util-wm" ,xcb-util-wm)
("zlib" ,zlib)
- ("libjpeg" ,libjpeg-8)
+ ("libjpeg" ,ijg-libjpeg-8)
("libsm" ,libsm)
("openssl" ,openssl-1.0)))
(native-inputs
--
2.24.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#39197] [PATCH core-updates 2/4] gnu: cmake-minimal: Build with a minimal variant of cURL.
2020-01-19 23:16 [bug#39197] [PATCH core-updates 0/4] Replace libjpeg with libjpeg-turbo Marius Bakke
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 1/4] gnu: RHash: Do not use git-fetch, but provide a fallback URL Marius Bakke
@ 2020-01-20 14:06 ` Jakub Kądziołka
2020-01-22 18:46 ` bug#39197: " Marius Bakke
1 sibling, 1 reply; 7+ messages in thread
From: Jakub Kądziołka @ 2020-01-20 14:06 UTC (permalink / raw)
To: 39197, mbakke
> This is necessary to avoid a circular dependency in the next commit.
>
> * gnu/packages/curl.scm (curl-minimal): New public variable.
> * gnu/packages/cmake.scm (cmake-minimal)[inputs]: Change from CURL to
> CURL-MINIMAL.
> (cmake)[inputs]: Do the opposite.
Is there a reason this curl-minimal couldn't also be used for
git-minimal? This would keep the updater working for rhash.
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#39197: [PATCH core-updates 2/4] gnu: cmake-minimal: Build with a minimal variant of cURL.
2020-01-20 14:06 ` [bug#39197] [PATCH core-updates 2/4] gnu: cmake-minimal: Build with a minimal variant of cURL Jakub Kądziołka
@ 2020-01-22 18:46 ` Marius Bakke
0 siblings, 0 replies; 7+ messages in thread
From: Marius Bakke @ 2020-01-22 18:46 UTC (permalink / raw)
To: Jakub Kądziołka, 39197-done
[-- Attachment #1.1: Type: text/plain, Size: 1103 bytes --]
Jakub Kądziołka <kuba@kadziolka.net> writes:
>> This is necessary to avoid a circular dependency in the next commit.
>>
>> * gnu/packages/curl.scm (curl-minimal): New public variable.
>> * gnu/packages/cmake.scm (cmake-minimal)[inputs]: Change from CURL to
>> CURL-MINIMAL.
>> (cmake)[inputs]: Do the opposite.
>
> Is there a reason this curl-minimal couldn't also be used for
> git-minimal? This would keep the updater working for rhash.
Good catch. I did this initially, but found it simpler to not use
git-fetch for RHash. I don't like inserting these 'magic' packages
around the graph. It also means we need two graft two cURLs instead of
one.
But I don't feel strongly about it, and keeping the updater working is a
good argument. So I was about to revert back, but then found out RHash
is available on sourceforge too:
https://sourceforge.net/projects/rhash/
Much better!
Since you made me reconsider, I also found a better solution for 2/4: we
can lose CMakes runtime dependency on 'curl-minimal' as well by using it
only once, to build libjpeg-turbo:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Type: text/x-patch, Size: 2447 bytes --]
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index d053935a86..fcc6642280 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -152,7 +152,7 @@
(apply invoke "./configure" configure-flags))))))
(native-inputs
`(("bzip2" ,bzip2)
- ("curl" ,curl-minimal)
+ ("curl" ,curl)
("expat" ,expat)
("file" ,file)
("libarchive" ,libarchive)
@@ -235,6 +235,18 @@ and workspaces that can be used in the compiler environment of your choice.")
(search-paths
(package-native-search-paths cmake-minimal))))
+;; The purpose of this package is to solve a circular dependency between
+;; packages that use cmake-build-system and CMakes own dependencies.
+(define-public cmake-minimal-bootstrap
+ (package
+ (inherit cmake-minimal)
+ (name "cmake-minimal-bootstrap")
+ (native-inputs
+ `(;; cURL depends on ghostscript (via groff and OpenLDAP), which depends on
+ ;; 'cmake-build-system' through libtiff and ultimately libjpeg-turbo.
+ ("curl" ,curl-minimal)
+ ,@(alist-delete "curl" (package-native-inputs cmake-minimal))))))
+
(define-public emacs-cmake-mode
(package
(inherit cmake)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 38efe61780..1b86f700e4 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -46,6 +46,7 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
+ #:use-module (gnu packages cmake)
#:use-module (gnu packages curl)
#:use-module (gnu packages compression)
#:use-module (gnu packages documentation)
@@ -1505,8 +1506,13 @@ is hereby granted."))))
(native-inputs
`(("nasm" ,nasm)))
(arguments
- '(#:configure-flags '("-DCMAKE_INSTALL_LIBDIR:PATH=lib"
- "-DENABLE_STATIC=0")))
+ `(#:configure-flags '("-DCMAKE_INSTALL_LIBDIR:PATH=lib"
+ "-DENABLE_STATIC=0")
+ ,@(if (%current-target-system)
+ '()
+ ;; Use a special "bootstrap" CMake for the native build to work
+ ;; around a circular dependency between CMake and this package.
+ `(#:cmake ,cmake-minimal-bootstrap))))
(home-page "https://libjpeg-turbo.org/")
(synopsis "SIMD-accelerated JPEG image handling library")
(description "libjpeg-turbo is a JPEG image codec that accelerates baseline
[-- Attachment #1.3: Type: text/plain, Size: 62 bytes --]
Thanks a lot for the feedback. Will push this shortly. :-)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-01-22 18:47 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-19 23:16 [bug#39197] [PATCH core-updates 0/4] Replace libjpeg with libjpeg-turbo Marius Bakke
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 1/4] gnu: RHash: Do not use git-fetch, but provide a fallback URL Marius Bakke
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 2/4] gnu: cmake-minimal: Build with a minimal variant of cURL Marius Bakke
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 3/4] gnu: Replace uses of 'libjpeg' with 'libjpeg-turbo' Marius Bakke
2020-01-19 23:20 ` [bug#39197] [PATCH core-updates 4/4] gnu: Deprecate the 'libjpeg' variable Marius Bakke
2020-01-20 14:06 ` [bug#39197] [PATCH core-updates 2/4] gnu: cmake-minimal: Build with a minimal variant of cURL Jakub Kądziołka
2020-01-22 18:46 ` bug#39197: " Marius Bakke
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).