From 6871121be0f19678b4a04d9dcf0124198a0e5fe6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 16:40:37 +0200 Subject: gnu: libjpeg-turbo: Update to 2.0.0. * gnu/packages/image.scm (libjpeg-turbo): Update to 2.0.0. [build-system]: Change to CMAKE-BUILD-SYSTEM. [arguments]: Adjust accordingly. --- gnu/packages/image.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 31c78f84ef..ab1e4df094 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1223,21 +1223,20 @@ PNG, and performs PNG integrity checks and corrections.") (define-public libjpeg-turbo (package (name "libjpeg-turbo") - (version "1.5.3") + (version "2.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" version "/" name "-" version ".tar.gz")) (sha256 (base32 - "08r5b5mywwrxv4axvq80dm31cklz81grczlzlxr2xqa6pgi90j5j")))) - (build-system gnu-build-system) + "0s48zz6awd493hmb200abmsizh68fh1jmz98r41n4c8dbl87d23p")))) + (build-system cmake-build-system) (native-inputs `(("nasm" ,nasm))) (arguments - '(#:test-target "test" - #:configure-flags (list "--with-build-date=1970-01-01" - "--disable-static"))) + '(#:configure-flags '("-DCMAKE_INSTALL_LIBDIR:PATH=lib" + "-DENABLE_STATIC=0"))) (home-page "https://libjpeg-turbo.org/") (synopsis "SIMD-accelerated JPEG image handling library") (description "libjpeg-turbo is a JPEG image codec that accelerates baseline -- cgit v1.2.3 From 71de61c353906d97f189a82ca35970b9202dde19 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Jul 2018 16:41:27 +0200 Subject: 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(-) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index ab1e4df094..b381c3f97b 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 -- cgit v1.2.3 From 64ed4b6a271637bfbda464033590c1d2a5c33c3e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 31 Jul 2018 21:53:47 +0300 Subject: gnu: optipng: Use system libraries. * gnu/packages/image.scm (optipng)[source]: Add snippet to delete bundled libraries. [inputs]: Add libpng. [arguments]: Add configure-flag to use system libraries. --- gnu/packages/image.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'gnu/packages/image.scm') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index b381c3f97b..b604712c99 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1199,10 +1199,17 @@ installed as @code{stb_image}.") version ".tar.gz")) (sha256 (base32 - "0lj4clb851fzpaq446wgj0sfy922zs5l5misbpwv6w7qrqrz4cjg")))) + "0lj4clb851fzpaq446wgj0sfy922zs5l5misbpwv6w7qrqrz4cjg")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "src/libpng") + (delete-file-recursively "src/zlib") + #t)))) (build-system gnu-build-system) (inputs - `(("zlib" ,zlib))) + `(("libpng" ,libpng) + ("zlib" ,zlib))) (arguments '(#:phases (modify-phases %standard-phases @@ -1210,7 +1217,8 @@ installed as @code{stb_image}.") (lambda* (#:key outputs #:allow-other-keys) ;; configure script doesn't accept arguments CONFIG_SHELL and SHELL (invoke "sh" "configure" - (string-append "--prefix=" (assoc-ref outputs "out"))) + (string-append "--prefix=" (assoc-ref outputs "out")) + "-with-system-libs") #t))))) (synopsis "Optimizer that recompresses PNG image files to a smaller size") (description "OptiPNG is a PNG optimizer that recompresses image -- cgit v1.2.3