aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-01-17 19:27:36 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-01-22 22:12:34 +0100
commita1552f52aa1b54e78eaa933a243fed2e99c6ba81 (patch)
treecc58e57bf299d970e17675e61fa50e4b025a78f7
parent4bd428a7ce382f623784a3ff8186aadc3cebca91 (diff)
downloadpatches-a1552f52aa1b54e78eaa933a243fed2e99c6ba81.tar
patches-a1552f52aa1b54e78eaa933a243fed2e99c6ba81.tar.gz
gnu: Deprecate the 'libjpeg' variable.
* gnu/packages/image.scm (libjpeg, libjpeg-8): Rename to ... (ijg-libjpeg, ijg-libjpeg-8): ... this. (libjpeg): Define as deprecated by LIBJPEG-TURBO.
-rw-r--r--gnu/packages/image.scm9
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 6bb0b47cb3..1b86f700e4 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -83,6 +83,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
@@ -364,7 +365,7 @@ Features:
@end enumerate")
(license license:gpl3+)))
-(define-public libjpeg
+(define-public ijg-libjpeg
(package
(name "libjpeg")
(version "9c")
@@ -393,8 +394,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)
@@ -1528,6 +1529,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")