me/guix
Archived
1
0
Fork 0
Code Activity

gnu: freeimage: Remove input labels.

Browse source 
* gnu/packages/image.scm (freeimage): Reindent.
[arguments]: Use G-expression and SEARCH-INPUT-DIRECTORY.
[inputs]: Remove labels.
This commit is contained in:
Marius Bakke 2022-08-09 23:13:45 +02:00
parent f2e9f04dd9
commit 02de6a5981
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 81 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gnu/packages/image.scm
View file

@ -19,7 +19,7 @@
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018-2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr> ;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
@ -98,6 +98,7 @@
#:use-module (gnu packages fonts) #:use-module (gnu packages fonts)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix utils) #:use-module (guix utils)
@ -1106,8 +1107,9 @@ supplies a generic doubly-linked list and some string functions.")
"0cwjxjz0f4gs6igvwqg0p99mnrsrwzkal1l2n08yvz2xq9s5khki")))))))) "0cwjxjz0f4gs6igvwqg0p99mnrsrwzkal1l2n08yvz2xq9s5khki"))))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
;; According to Fedora these files depend on private headers, but their ;; According to Fedora these files depend on private headers, but their
;; presence is required for building, so we replace them with empty files. ;; presence is required for building, so we replace them with empty files.
(add-after 'unpack 'delete-unbuildable-files (add-after 'unpack 'delete-unbuildable-files
@ -1116,8 +1118,7 @@ supplies a generic doubly-linked list and some string functions.")
(delete-file file) (delete-file file)
(close (open file O_CREAT))) (close (open file O_CREAT)))
'("Source/FreeImage/PluginG3.cpp" '("Source/FreeImage/PluginG3.cpp"
"Source/FreeImageToolkit/JPEGTransform.cpp")) "Source/FreeImageToolkit/JPEGTransform.cpp"))))
#t))
;; These scripts generate the Makefiles. ;; These scripts generate the Makefiles.
(replace 'configure (replace 'configure
(lambda _ (lambda _
@ -1127,27 +1128,27 @@ supplies a generic doubly-linked list and some string functions.")
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile.gnu" (substitute* "Makefile.gnu"
(("/usr") (assoc-ref outputs "out")) (("/usr") (assoc-ref outputs "out"))
(("-o root -g root") "")) (("-o root -g root") "")))))
#t)))
#:make-flags #:make-flags
(list ,(string-append "CC=" (cc-for-target)) #~(let ((jxrlib (search-input-directory %build-inputs "include/jxrlib")))
(list (string-append "CC=" #$(cc-for-target))
;; We need '-fpermissive' for Source/FreeImage.h. ;; We need '-fpermissive' for Source/FreeImage.h.
;; libjxr doesn't have a pkg-config file. ;; libjxr doesn't have a pkg-config file.
(string-append "CFLAGS+=-O2 -fPIC -fvisibility=hidden -fpermissive " (string-append "CFLAGS+=-O2 -fPIC -fvisibility=hidden "
"-I" (assoc-ref %build-inputs "libjxr") "/include/jxrlib")) "-fpermissive -I" jxrlib)))
#:tests? #f)) ; no check target #:tests? #f)) ; no check target
(native-inputs (native-inputs
(list pkg-config unzip)) (list pkg-config unzip))
(inputs (inputs
`(("libjpeg" ,libjpeg-turbo) (list libjpeg-turbo
("libjxr" ,libjxr) libjxr
("libpng" ,libpng) libpng
("libraw" ,libraw) libraw
("libtiff" ,libtiff) libtiff
("libwebp" ,libwebp) libwebp
("openexr" ,openexr-2) openexr-2
("openjpeg" ,openjpeg) openjpeg
("zlib" ,zlib))) zlib))
(synopsis "Library for handling popular graphics image formats") (synopsis "Library for handling popular graphics image formats")
(description (description
"FreeImage is a library for developers who would like to support popular "FreeImage is a library for developers who would like to support popular