diff options
Diffstat (limited to 'gnu/packages/gimp.scm')
| -rw-r--r-- | gnu/packages/gimp.scm | 202 |
1 files changed, 111 insertions, 91 deletions
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 2da57ee8ee..0ad75de700 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015 Ludovic Courtès <[email protected]> +;;; Copyright © 2014, 2015, 2021 Ludovic Courtès <[email protected]> ;;; Copyright © 2016, 2018 Ricardo Wurmus <[email protected]> ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <[email protected]> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <[email protected]> @@ -7,6 +7,7 @@ ;;; Copyright © 2018 Thorsten Wilms <[email protected]> ;;; Copyright © 2020 Marius Bakke <[email protected]> ;;; Copyright © 2020 Michael Rohleder <[email protected]> +;;; Copyright © 2021 Vinicius Monego <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +39,8 @@ #:use-module (gnu packages base) #:use-module (gnu packages build-tools) #:use-module (gnu packages documentation) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages graphviz) #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) @@ -49,11 +52,13 @@ #:use-module (gnu packages compression) #:use-module (gnu packages xml) #:use-module (gnu packages linux) + #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) #:use-module (gnu packages patchutils) #:use-module (gnu packages pdf) #:use-module (gnu packages photo) #:use-module (gnu packages python) + #:use-module (gnu packages sdl) #:use-module (gnu packages web) #:use-module (gnu packages xorg)) @@ -117,15 +122,15 @@ (string-append doc "/share/doc/poly2tri-c")) #t)))))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("doxygen" ,doxygen) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("unzip" ,unzip) - ("which" ,which))) + (list autoconf + automake + doxygen + libtool + pkg-config + unzip + which)) (propagated-inputs - `(("glib" ,glib))) + (list glib)) (synopsis "2D constrained Delaunay triangulation library") (description "Poly2Tri-C is a library for generating, refining and rendering 2-Dimensional Constrained Delaunay Triangulations.") @@ -151,7 +156,7 @@ (arguments `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (propagated-inputs `(("alsa" ,alsa-lib) ("cairo" ,cairo) @@ -168,7 +173,7 @@ of a larger interface.") (define-public babl (package (name "babl") - (version "0.1.86") + (version "0.1.88") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/babl/" @@ -182,17 +187,17 @@ of a larger interface.") "/babl-" version ".tar.xz"))) (sha256 (base32 - "1w68h81kqkqnziixrx21qs0gfv2z79651h19sxn226xdb58mjgqb")))) + "0fbh2ss1dy3sba4xjmfm4vxxjmx9a6rzgba9ycjygchbm957y3ag")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-0.55 - #:configure-flags - (list "-Denable-gir=false"))) + `(#:configure-flags + (list "-Denable-gir=false" + "-Dwith-docs=false"))) (native-inputs - `(("pkg-config" ,pkg-config))) + (list gobject-introspection pkg-config vala)) (propagated-inputs ;; Propagated to satisfy ‘babl.pc’. - `(("lcms" ,lcms))) + (list lcms)) (home-page "https://gegl.org/babl/") (synopsis "Image pixel format conversion library") (description @@ -208,25 +213,24 @@ provided, as well as a framework to add new color models and data types.") (define-public gegl (package (name "gegl") - (version "0.4.30") - (source (origin - (method url-fetch) - (uri (list (string-append "https://download.gimp.org/pub/gegl/" - (string-take version 3) - "/gegl-" version ".tar.xz") - (string-append "https://ftp.gtk.org/pub/gegl/" - (version-major+minor version) - "/gegl-" version ".tar.xz") - (string-append "ftp://ftp.gtk.org/pub/gegl/" - (version-major+minor version) - "/gegl-" version ".tar.xz"))) - (sha256 - (base32 - "1pd8xkx70k0fsi1hrzrmaify7112wjmxzk0p6bi6js89yhn7h4n1")))) + (version "0.4.34") + (source + (origin + (method url-fetch) + (uri (list (string-append "https://download.gimp.org/pub/gegl/" + (string-take version 3) + "/gegl-" version ".tar.xz") + (string-append "https://ftp.gtk.org/pub/gegl/" + (version-major+minor version) + "/gegl-" version ".tar.xz") + (string-append "ftp://ftp.gtk.org/pub/gegl/" + (version-major+minor version) + "/gegl-" version ".tar.xz"))) + (sha256 + (base32 "1amazk6g9dk76rxwaqa81j87ql5vgz539n6xk88wccdllnyg0qzg")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-0.55 - #:configure-flags + `(#:configure-flags (list "-Dintrospection=false") #:phases (modify-phases %standard-phases @@ -241,22 +245,35 @@ provided, as well as a framework to add new color models and data types.") (string-append match "0"))) (substitute* (find-files "tests" "^meson\\.build$") (("timeout ?: [0-9]+" match) - (string-append match "0"))) - #t))))) + (string-append match "0")))))))) ;; These are propagated to satisfy 'gegl-0.4.pc'. (propagated-inputs - `(("babl" ,babl) - ("glib" ,glib) - ("json-glib" ,json-glib))) + (list babl glib json-glib)) (inputs + ;; All inputs except libjpeg and libpng are optional. `(("cairo" ,cairo) - ("pango" ,pango) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gexiv2" ,gexiv2) + ("jasper" ,jasper) + ("libjpeg" ,libjpeg-turbo) + ("libnsgif" ,libnsgif) ("libpng" ,libpng) - ("libjpeg" ,libjpeg-turbo))) + ("libraw" ,libraw) + ("librsvg" ,librsvg) + ("libspiro" ,libspiro) + ("libtiff" ,libtiff) + ("libwebp" ,libwebp) + ("maxflow" ,maxflow) + ("openexr" ,openexr-2) + ("pango" ,pango) + ("poppler" ,poppler) + ("sdl2" ,sdl2))) (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; for gtester - ("intltool" ,intltool))) + (list `(,glib "bin") ; for gtester + gobject-introspection + intltool + pkg-config + vala)) (home-page "https://gegl.org") (synopsis "Graph based image processing framework") (description "GEGL (Generic Graphics Library) provides infrastructure to @@ -269,7 +286,7 @@ buffers.") (define-public gimp (package (name "gimp") - (version "2.10.24") + (version "2.10.30") (source (origin (method url-fetch) @@ -277,7 +294,7 @@ buffers.") (version-major+minor version) "/gimp-" version ".tar.bz2")) (sha256 - (base32 "17lq6ns5qhspd171zqh76yf98xnn5n0hcl7hbhbx63cc6ribf6xx")))) + (base32 "1p375gaw2daip6aiv1icrlpws5m1my5kalxkxrvl4zgdfsm5v0c8")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML @@ -304,7 +321,7 @@ buffers.") ;; Install 'sitecustomize.py' into gimp's python directory to ;; add pygobject and pygtk to pygimp's search path. (lambda* (#:key outputs #:allow-other-keys) - (let* ((pythonpath (getenv "PYTHONPATH")) + (let* ((pythonpath (getenv "GUIX_PYTHONPATH")) (out (assoc-ref outputs "out")) (sitecustomize.py (string-append @@ -315,30 +332,36 @@ buffers.") (format port "for dir in '~a'.split(':'):~%" pythonpath) (format port " site.addsitedir(dir)~%"))))))))) (inputs - `(("babl" ,babl) + `(("atk" ,atk) + ("babl" ,babl) + ("gegl" ,gegl) + ("gexiv2" ,gexiv2) ("glib" ,glib) ("glib-networking" ,glib-networking) - ("libtiff" ,libtiff) - ("libwebp" ,libwebp) - ("libjpeg" ,libjpeg-turbo) - ("atk" ,atk) - ("gexiv2" ,gexiv2) ("gtk+" ,gtk+-2) + ("libjpeg" ,libjpeg-turbo) ("libmypaint" ,libmypaint) + ("libtiff" ,libtiff) + ("libwebp" ,libwebp) ("mypaint-brushes" ,mypaint-brushes-1.3) - ("exif" ,libexif) ; optional, EXIF + XMP support - ("lcms" ,lcms) ; optional, color management - ("librsvg" ,librsvg) ; optional, SVG support - ("libxcursor" ,libxcursor) ; optional, Mouse Cursor support - ("poppler" ,poppler) ; optional, PDF support - ("poppler-data" ,poppler-data) - ("python" ,python-2) ; optional, Python support - ("python2-pygtk" ,python2-pygtk) ; optional, Python support - ("gegl" ,gegl))) + ("exif" ,libexif) ; optional, EXIF + XMP support + ("ghostscript" ,ghostscript) ; optional, EPS + PS support + ("lcms" ,lcms) ; optional, color management + ("libheif" ,libheif) ; optional, HEIF + AVIF support + ("libmng" ,libmng) ; optional, MNG support + ("librsvg" ,librsvg) ; optional, SVG support + ("libxcursor" ,libxcursor) ; optional, Mouse Cursor support + ("openexr" ,openexr-2) ; optional, EXR support + ("openjpeg" ,openjpeg) ; optional, JPEG 2000 support + ("poppler" ,poppler) ; optional, PDF support + ("poppler-data" ,poppler-data) ; optional, PDF support + ("python" ,python-2) ; optional, Python support + ("python2-pygtk" ,python2-pygtk))) ; optional, Python support (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-compile-resources and gdbus-codegen - ("pkg-config" ,pkg-config) - ("intltool" ,intltool))) + `(("desktop-file-utils" ,desktop-file-utils) + ("glib:bin" ,glib "bin") ; for glib-compile-resources and gdbus-codegen + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) (home-page "https://www.gimp.org") (synopsis "GNU Image Manipulation Program") (description @@ -369,8 +392,8 @@ that is extensible via a plugin system.") (replace 'configure (lambda* (#:key inputs #:allow-other-keys) (mkdir-p "tmppkgconfig") - (copy-file (string-append (assoc-ref inputs "gegl") - "/lib/pkgconfig/gegl-0.4.pc") + (copy-file (search-input-file inputs + "/lib/pkgconfig/gegl-0.4.pc") "tmppkgconfig/gegl-0.3.pc") (setenv "PKG_CONFIG_PATH" (string-append "tmppkgconfig:" @@ -390,17 +413,17 @@ that is extensible via a plugin system.") (mkdir-p target)) #t))))) (inputs - `(("fftw" ,fftw) - ("gimp" ,gimp) - ;; needed by gimp-2.0.pc - ("gdk-pixbuf" ,gdk-pixbuf) - ("gegl" ,gegl) - ("cairo" ,cairo) - ("glib" ,glib) - ;; needed by gimpui-2.0.pc - ("gtk+" ,gtk+-2))) + (list fftw + gimp + ;; needed by gimp-2.0.pc + gdk-pixbuf + gegl + cairo + glib + ;; needed by gimpui-2.0.pc + gtk+-2)) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (home-page "https://www.lprp.fr/gimp_plugin_en/#fourier") (synopsis "GIMP plug-in to edit image in fourier space") (description @@ -424,14 +447,12 @@ inverse fourier transform.") "0priwpmc7dizccqvn21ig6d649bprl3xl1hmjj7nddznjgr585vl")))) (build-system gnu-build-system) (native-inputs - `(("intltool" ,intltool) - ("pkg-config" ,pkg-config))) + (list intltool pkg-config)) ;; As needed by 'libmypaint.pc'. (propagated-inputs - `(("json-c" ,json-c) - ("gobject-introspection" ,gobject-introspection))) + (list json-c gobject-introspection)) (inputs - `(("glib" ,glib))) + (list glib)) (synopsis "Artistic brushes library") (description "Libmypaint, also called \"brushlib\", is a library for making brushstrokes which is used by MyPaint and GIMP.") @@ -453,8 +474,7 @@ brushstrokes which is used by MyPaint and GIMP.") (base32 "0kcqz13vzpy24dhmrx9hbs6s7hqb8y305vciznm15h277sabpmw9")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake))) + (list autoconf automake)) (synopsis "Default brushes for MyPaint") (description "This package provides the default set of brushes for MyPaint.") @@ -530,12 +550,12 @@ MyPaint.") ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs - `(("gimp" ,gimp) - ("gdk-pixbuf" ,gdk-pixbuf) ; needed by gimp-2.0.pc - ("cairo" ,cairo) - ("gegl" ,gegl) - ("gtk+" ,gtk+-2) ; needed by gimpui-2.0.pc - ("glib" ,glib))) + (list gimp + gdk-pixbuf ; needed by gimp-2.0.pc + cairo + gegl + gtk+-2 ; needed by gimpui-2.0.pc + glib)) (home-page "https://github.com/bootchk/resynthesizer") (synopsis "GIMP plugins for texture synthesis") (description @@ -608,7 +628,7 @@ transferring the style of an image.") ;; Install 'sitecustomize.py' into glimpse's python directory to ;; add pygobject and pygtk to pygimp's search path. (lambda* (#:key outputs #:allow-other-keys) - (let* ((pythonpath (getenv "PYTHONPATH")) + (let* ((pythonpath (getenv "GUIX_PYTHONPATH")) (out (assoc-ref outputs "out")) (sitecustomize.py (string-append |