[PATCH] gnu: agg: New variable.

[PATCH] gnu: agg: New variable.

[Tomáš Čech]

* gnu/packages/graphics.scm (agg): New variable.
---
 gnu/packages/graphics.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 1ee4d7e..27513fd 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -23,10 +23,16 @@
   #:use-module (guix build-system cmake)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages fontutils)
   #:use-module (gnu packages multiprecision)
-  #:use-module (gnu packages boost))
+  #:use-module (gnu packages boost)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages sdl)
+)
 
 (define-public cgal
   (package
@@ -152,3 +158,50 @@ output.")
     ;; The web site says it's under a BSD-3 license, but the 'LICENSE' file
     ;; and headers use different wording.
     (license (license:non-copyleft "file://LICENSE"))))
+
+(define-public agg
+  (package
+    (name "agg")
+    (version "2.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://www.antigrain.com/agg-"
+                                  version ".tar.gz"))
+              (sha256 (base32
+                       "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb"))
+              (patches (list (search-patch "am_c_prototype.patch")
+                             (search-patch
+                              "antigrain-geometry-no_rpath.patch")))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags
+       (list (string-append "--x-includes=" (assoc-ref %build-inputs "libx11")
+                            "/include")
+             (string-append "--x-libraries=" (assoc-ref %build-inputs "libx11")
+                            "/lib"))
+       #:phases
+       (alist-cons-after
+        'unpack 'autoreconf
+        (lambda _
+          ;; let's call configure from configure phase and not now
+          (substitute* "autogen.sh" (("./configure") "# ./configure"))
+          (zero? (system* "sh" "autogen.sh")))
+        %standard-phases)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("libtool" ,libtool)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("bash" ,bash)))
+    (inputs
+     `(("libx11" ,libx11)
+       ("freetype" ,freetype)
+       ("sdl" ,sdl)))
+
+    (home-page "http://antigrain.com")
+    (synopsis "A high quality rendering engine for C++")
+    (description
+     "Anti-Grain Geometry is high quality rendering engine written in C++.  It
+supports sub pixel resolutions and anti-aliasing.  It is also library for
+rendering SVG graphics")
+    (license license:gpl2+)))
-- 
2.2.1

Re: [PATCH] gnu: agg: New variable.

[Ludovic Courtès]

Tomáš Čech <sleep_walker@gnu.org> skribis:

> * gnu/packages/graphics.scm (agg): New variable.

Please adjust the commit’s subject line as Andreas suggested.

> +              (uri (string-append "http://www.antigrain.com/agg-"
> +                                  version ".tar.gz"))
> +              (sha256 (base32
> +                       "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb"))

Maybe put ‘base32’ on the next line, as is done in the rest of this file
an elsewhere.

> +              (patches (list (search-patch "am_c_prototype.patch")
> +                             (search-patch
> +                              "antigrain-geometry-no_rpath.patch")))))

Please add these two patches to the patch, and list them in
gnu-system.am.

> +       (alist-cons-after
> +        'unpack 'autoreconf
> +        (lambda _
> +          ;; let's call configure from configure phase and not now
> +          (substitute* "autogen.sh" (("./configure") "# ./configure"))
> +          (zero? (system* "sh" "autogen.sh")))

So the tarball they provide is not generated from ‘make dist’?  Bah.

> +    (synopsis "A high quality rendering engine for C++")

“High-quality 2D graphics rendering engine for C++”

> +    (description
> +     "Anti-Grain Geometry is high quality rendering engine written in C++.  It
                              ^^^
“is a high-quality”

> +supports sub pixel resolutions and anti-aliasing.  It is also library for

“sub-pixel”

> +rendering SVG graphics")

Add missing period.

OK to push with these changes.

Thank you!

Ludo’.

Re: [PATCH] gnu: agg: New variable.

[Tomáš Čech]

[-- Attachment #1: Type: text/plain, Size: 1750 bytes --]

Thanks for review,

it seems that I'm getting too chaotic as I work on many packages
simultaneously. Sorry about that.


On Tue, Mar 17, 2015 at 10:10:56AM +0100, Ludovic Courtès wrote:
>Tomáš Čech <sleep_walker@gnu.org> skribis:
>
>> * gnu/packages/graphics.scm (agg): New variable.
>
>Please adjust the commit’s subject line as Andreas suggested.

Fixed.

>
>> +              (uri (string-append "http://www.antigrain.com/agg-"
>> +                                  version ".tar.gz"))
>> +              (sha256 (base32
>> +                       "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb"))
>
>Maybe put ‘base32’ on the next line, as is done in the rest of this file
>an elsewhere.

Fixed.

>
>> +              (patches (list (search-patch "am_c_prototype.patch")
>> +                             (search-patch
>> +                              "antigrain-geometry-no_rpath.patch")))))
>
>Please add these two patches to the patch, and list them in
>gnu-system.am.

This is critical miss.
>
>> +       (alist-cons-after
>> +        'unpack 'autoreconf
>> +        (lambda _
>> +          ;; let's call configure from configure phase and not now
>> +          (substitute* "autogen.sh" (("./configure") "# ./configure"))
>> +          (zero? (system* "sh" "autogen.sh")))
>
>So the tarball they provide is not generated from ‘make dist’?  Bah.

No, really, I'm glad I made it compile.

>> +    (synopsis "A high quality rendering engine for C++")
>
>“High-quality 2D graphics rendering engine for C++”

The best text to be placed there is already taken by authors and wikipedia
people. It's hard to divert :b

Rest fixed as well.

Thanks for the review.

S_W

[-- Attachment #2: Type: application/pgp-signature, Size: 181 bytes --]