mbakke pushed a commit to branch master
in repository guix.
commit 71de61c353906d97f189a82ca35970b9202dde19
Author: Marius Bakke <[email protected]>
Date: Sat Jul 28 16:41:27 2018 +0200
gnu: libjpeg-turbo: Update license.
* gnu/packages/image.scm (libjpeg-turbo)[license]: Add ZLIB.
---
gnu/packages/image.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index ab1e4df..b381c3f 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1248,8 +1248,10 @@ libjpeg-turbo implements both the traditional libjpeg
API and the less powerful
but more straightforward TurboJPEG API, and provides a full-featured Java
interface. It supports color space extensions that allow it to compress from
and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).")
- (license (list license:bsd-3 ; jsimd*.[ch] and most of simd/
- license:ijg)))) ; the rest
+ ;; libjpeg-turbo is covered by three different licenses; see LICENSE.md.
+ (license (list license:bsd-3 ;the TurboJPEG API library and programs
+ license:ijg ;the libjpeg library and associated
tools
+ license:zlib)))) ;the libjpeg-turbo SIMD extensions
(define-public niftilib
(package
