[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/15: gnu: gegl: Update package definition.
|
From: |
guix-commits |
|
Subject: |
11/15: gnu: gegl: Update package definition. |
|
Date: |
Sat, 25 Jul 2020 10:28:38 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit b7bcd8bc222357ff90e7d1cb93f1c106ffdd5282
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Tue Jul 21 03:45:21 2020 -0400
gnu: gegl: Update package definition.
* gnu/packages/gimp.scm (gegl): Update package definition.
[source]<origin>[patches]: Add gegl-mrg.patch.
[outputs]: New output "doc".
[arguments]<#:configure-flags>[-Dintrospection]: Remove flag.
[-Ddocs]: New flag.
[-Dworkshop]: New flag.
[-Dsdl1]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
['move-doc]: New phase.
[native-inputs]: Add asciidoc, docbook-xml, docbook-xsl, enscript,
gobject-introspection, gtk-doc, perl, python-pygobject, python-wrapper,
ruby and vala.
[inputs]: Add exiv2, gdk-pixbuf+svg, gexiv2, jasper, lcms, lensfun, ffmpeg,
libnsgif, libraw, librsvg, libspiro, libtiff, lua, luajit, mrg, openexr,
poly2tri-c,
poppler, sdl, sdl2, suitesparse, v4l-utils and libwebp.
[synopsis]: Modify.
[description]: Modify.
[license]: Remove gpl3+.
* gnu/packages/patches/gegl-mrg.patch: New file.
* gnu/local.mk (gegl-mrg.patch): New reference.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/local.mk | 1 +
gnu/packages/gimp.scm | 134 +++++++++++++++++++++++++++---------
gnu/packages/patches/gegl-mrg.patch | 25 +++++++
3 files changed, 128 insertions(+), 32 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index a5a7125..0c5be2f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -974,6 +974,7 @@ dist_patch_DATA =
\
%D%/packages/patches/gd-brect-bounds.patch \
%D%/packages/patches/gdb-hurd.patch \
%D%/packages/patches/gdm-default-session.patch \
+ %D%/packages/patches/gegl-mrg.patch \
%D%/packages/patches/geoclue-config.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
%D%/packages/patches/ghc-testsuite-dlopen-pie.patch \
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 417def1..6f33d87 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -35,8 +35,10 @@
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
+ #:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages fontutils)
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages gnome)
@@ -45,13 +47,19 @@
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages compression)
#:use-module (gnu packages xml)
+ #:use-module (gnu packages lua)
+ #:use-module (gnu packages maths)
#:use-module (gnu packages linux)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages patchutils)
+ #:use-module (gnu packages perl)
#:use-module (gnu packages pdf)
#:use-module (gnu packages photo)
+ #:use-module (gnu packages pretty-print)
#:use-module (gnu packages python)
#:use-module (gnu packages ruby)
+ #:use-module (gnu packages sdl)
+ #:use-module (gnu packages video)
#:use-module (gnu packages w3m)
#:use-module (gnu packages web)
#:use-module (gnu packages xorg))
@@ -209,46 +217,108 @@ specific code paths.")
(package
(name "gegl")
(version "0.4.24")
- (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
- "0ji57s7cba94vzy49agn7x47ca61rccm6rif0cb0s6rl4ygljrbp"))))
+ (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 "0ji57s7cba94vzy49agn7x47ca61rccm6rif0cb0s6rl4ygljrbp"))
+ (patches
+ ;; Fix for the bug,
+ ;; https://gitlab.gnome.org/GNOME/gegl/-/issues/259
+ (search-patches "gegl-mrg.patch"))))
(build-system meson-build-system)
+ (outputs '("out" "doc"))
(arguments
`(#:configure-flags
- (list "-Dintrospection=false")))
- ;; These are propagated to satisfy 'gegl-0.4.pc'.
+ (list
+ "-Ddocs=true"
+ "-Dworkshop=true"
+ "-Dsdl1=auto")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "docs"
+ (substitute* "gegl-docs.xml"
+ (("http://www.oasis-open.org/docbook/xml/4.3/";)
+ (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook/"))))
+ #t))
+ (add-after 'install 'move-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (mkdir-p (string-append doc "/share"))
+ (rename-file
+ (string-append out "/share/gtk-doc")
+ (string-append doc "/share/gtk-doc"))
+ #t))))))
+ (native-inputs
+ `(("asciidoc" ,asciidoc)
+ ("docbook-xml" ,docbook-xml-4.3)
+ ("docbook-xsl" ,docbook-xsl)
+ ("enscript" ,enscript)
+ ("glib" ,glib "bin")
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
+ ("intltool" ,intltool)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("pygobject" ,python-pygobject)
+ ("python" ,python-wrapper)
+ ("ruby" ,ruby)
+ ("vapigen" ,vala)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("exiv2" ,exiv2)
+ ("gdk-pixbuf" ,gdk-pixbuf+svg)
+ ("gexiv2" ,gexiv2)
+ ("jasper" ,jasper)
+ ("lcms" ,lcms)
+ ("lensfun" ,lensfun)
+ ("libav" ,ffmpeg)
+ ("libnsgif" ,libnsgif)
+ ("libpng" ,libpng)
+ ("libjpeg" ,libjpeg-turbo)
+ ("libraw" ,libraw)
+ ("librsvg" ,librsvg)
+ ("libspiro" ,libspiro)
+ ("libtiff" ,libtiff)
+ ("lua" ,lua)
+ ("luajit" ,luajit)
+ ("mrg" ,mrg)
+ ("openexr" ,openexr)
+ ("pango" ,pango)
+ ;; To be enabled after upstream fixes the bug,
+ ;; https://gitlab.gnome.org/GNOME/gegl/-/issues/258
+ ;; ("poly2tri-c" ,poly2tri-c)
+ ("poppler" ,poppler)
+ ("sdl1" ,sdl)
+ ("sdl2" ,sdl2)
+ ("umfpack" ,suitesparse)
+ ("v4l" ,v4l-utils)
+ ("webp" ,libwebp)))
(propagated-inputs
`(("babl" ,babl)
("glib" ,glib)
("json-glib" ,json-glib)))
- (inputs
- `(("cairo" ,cairo)
- ("pango" ,pango)
- ("libpng" ,libpng)
- ("libjpeg" ,libjpeg-turbo)))
- (native-inputs
- `(("pkg-config" ,pkg-config)
- ("glib" ,glib "bin") ; for gtester
- ("intltool" ,intltool)))
+ (synopsis "Generic Graphics Library")
+ (description "GEGL is a data flow based image processing framework,
+providing floating point processing and non-destructive image processing
+capabilities to GNU Image Manipulation Program and other projects.")
(home-page "http://gegl.org";)
- (synopsis "Graph based image processing framework")
- (description "GEGL (Generic Graphics Library) provides infrastructure to
-do demand based cached non destructive image editing on larger than RAM
-buffers.")
- ;; The library itself is licensed under LGPL while the sample commandline
- ;; application and GUI binary gegl is licensed under GPL.
- (license (list license:lgpl3+ license:gpl3+))))
+ (license license:lgpl3+)))
(define-public gimp
(package
diff --git a/gnu/packages/patches/gegl-mrg.patch
b/gnu/packages/patches/gegl-mrg.patch
new file mode 100644
index 0000000..d91a669
--- /dev/null
+++ b/gnu/packages/patches/gegl-mrg.patch
@@ -0,0 +1,25 @@
+From 271e2654229db0ba72a95a7256cb9d148aa7621a Mon Sep 17 00:00:00 2001
+From: Raghav Gururajan <raghavgururajan@disroot.org>
+Date: Sat, 25 Jul 2020 05:04:26 -0400
+Subject: [PATCH] [PATCH]: Fix build with mrg. #259
+
+---
+ bin/mrg-gegl.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/mrg-gegl.h b/bin/mrg-gegl.h
+index 485ec97bf..2c055a69a 100644
+--- a/bin/mrg-gegl.h
++++ b/bin/mrg-gegl.h
+@@ -1,7 +1,7 @@
+ #ifndef MRG_GEGL_H
+ #define MRG_GEGL_H
+
+-#include <mrg/mrg.h>
++#include <mrg.h>
+ #include <gegl/gegl.h>
+
+ void mrg_gegl_buffer_blit (Mrg *mrg,
+--
+2.27.0
+
- 02/15: gnu: babl: Update package definition., (continued)
- 02/15: gnu: babl: Update package definition., guix-commits, 2020/07/25
- 03/15: gnu: evolution-data-server: Update package definition., guix-commits, 2020/07/25
- 04/15: gnu: Add gtx., guix-commits, 2020/07/25
- 06/15: gnu: Add zeitgeist., guix-commits, 2020/07/25
- 05/15: gnu: Add dee., guix-commits, 2020/07/25
- 13/15: gnu: gexiv2: Update package definition., guix-commits, 2020/07/25
- 15/15: gnu: Add sgml-common., guix-commits, 2020/07/25
- 10/15: gnu: Add mrg., guix-commits, 2020/07/25
- 08/15: gnu: Add poly2tri-c., guix-commits, 2020/07/25
- 12/15: gnu: geocode-glib: Update package definition., guix-commits, 2020/07/25
- 11/15: gnu: gegl: Update package definition.,
guix-commits <=
- 09/15: gnu: Add mmm., guix-commits, 2020/07/25
- 14/15: gnu: Add openjade., guix-commits, 2020/07/25
- 07/15: gnu: folks: Update package definition., guix-commits, 2020/07/25