From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Thompson Subject: Re: [PATCH] gnu: Add freeimage. Date: Sat, 01 Nov 2014 13:21:55 -0400 Message-ID: <87bnoqx2do.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> References: <87egtmx6ox.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> <20141101165950.GA10580@debian> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43490) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkcNK-0008NH-2y for guix-devel@gnu.org; Sat, 01 Nov 2014 13:22:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XkcNE-0006LV-DH for guix-devel@gnu.org; Sat, 01 Nov 2014 13:22:06 -0400 Received: from na3sys009aog122.obsmtp.com ([74.125.149.147]:49317) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkcNE-0006LM-1J for guix-devel@gnu.org; Sat, 01 Nov 2014 13:22:00 -0400 Received: by mail-qc0-f172.google.com with SMTP id i17so7485414qcy.3 for ; Sat, 01 Nov 2014 10:21:58 -0700 (PDT) In-Reply-To: <20141101165950.GA10580@debian> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Andreas Enge Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain Andreas Enge writes: > Hello! > > On Sat, Nov 01, 2014 at 11:48:46AM -0400, David Thompson wrote: >> + (uri (string-append "mirror://sourceforge/freeimage/Source%20Distribution/" >> + version "/FreeImage" >> + (string-join (string-split version #\.) "") >> + ".zip")) > > This looks a bit longer than the 80 characters limit. The first argument to string append goes over, but that's okay IMO because it is a single atom. In any case, I just added a newline after string-append and the issue goes away. > >> + 'unpack >> + (lambda* (#:key source #:allow-other-keys) >> + (and (zero? (system* "unzip" source)) >> + (chdir "FreeImage"))) > > I wonder if this should not be moved to the standard unpack phase. Can we > determine the file format and use the appropriate tool, unzip or tar, > automatically? (Assuming that there are no .tar.zip out there, of > course.) I've been thinking about this, too. I don't think I would like the GNU build system to depend on unzip since very few packages require it and it's not a format that GNU uses, but maybe a procedure that replaced the standard unpack phase with one that uses unzip would be nice. I think that work could/should be saved for a future patch. Updated patch attached. Thanks for the review! --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-Add-freeimage.patch >From 2972e6e41d7c13dd619f0dd7fbda7b2a4ec0c6cc Mon Sep 17 00:00:00 2001 From: David Thompson Date: Wed, 25 Jun 2014 19:50:30 -0400 Subject: [PATCH] gnu: Add freeimage. * gnu/packages/image.scm (freeimage): New variable. --- gnu/packages/image.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 38e3ddd..f4f4c78 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages ghostscript) ;lcms #:use-module (gnu packages xorg) #:use-module (gnu packages perl) + #:use-module (gnu packages zip) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) @@ -341,3 +342,44 @@ supplies a generic doubly-linked list and some string functions.") ;; X11 license. (license (license:x11-style "file://COPYING" "See 'COPYING' in the distribution.")))) + +(define-public freeimage + (package + (name "freeimage") + (version "3.16.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/freeimage/Source%20Distribution/" + version "/FreeImage" + (string-join (string-split version #\.) "") + ".zip")) + (sha256 + (base32 + "0q1gnjnxgphsh4l8i9rfly4bi8xsczsb9ryzbm8hf38lc3fk5bq3")))) + (build-system gnu-build-system) + (arguments + '(#:phases (alist-replace + 'unpack + (lambda* (#:key source #:allow-other-keys) + (and (zero? (system* "unzip" source)) + (chdir "FreeImage"))) + (alist-delete + 'configure + (alist-cons-before + 'build 'patch-makefile + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile.gnu" + (("/usr") (assoc-ref outputs "out")) + (("-o root -g root") ""))) + %standard-phases))) + #:make-flags '("CC=gcc") + #:tests? #f)) ; no check target + (native-inputs + `(("unzip" ,unzip))) + (synopsis "Library for handling popular graphics image formats") + (description + "FreeImage is a library for developers who would like to support popular +graphics image formats like PNG, BMP, JPEG, TIFF and others.") + (license license:gpl2+) + (home-page "http://freeimage.sourceforge.net"))) -- 2.1.1 --=-=-= Content-Type: text/plain -- David Thompson Web Developer - Free Software Foundation - http://fsf.org GPG Key: 0FF1D807 Support the FSF: https://fsf.org/donate --=-=-=--