From a1552f52aa1b54e78eaa933a243fed2e99c6ba81 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Fri, 17 Jan 2020 19:27:36 +0100
Subject: 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.
---
 gnu/packages/image.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'gnu')

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")
-- 
cgit 1.4.1