On Sat, 15 Oct 2016 16:51:00 -0400
Kei Kebreau <k...@openmailbox.org> wrote:

> Julien Lepiller <jul...@lepiller.eu> writes:
> 
> > Hi,
> >
> > I attached a patch to add fbida, a frame-buffer based image and pdf
> > viewer. I created a new file, since I didn't find an existing one
> > where it could go. Let me know if you prefer it in an existing
> > file.  
> 
> Hi Julien! Your patch looks fine as far as linting and reproducibility
> goes. Some pointers for your patch:
> 
> In my opinion, this can go in pdf.scm, as the mupdf package is there
> and it has similar functions to fbida. Also, when you add fbida to
> pdf.scm, don't forget to add a copyright notice for yourself!

I attached an updated patch.

From b86ec5a8d7a936c76aa6c0b5ccc620e1d1bbf418 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <jul...@lepiller.eu>
Date: Sat, 15 Oct 2016 14:40:30 +0200
Subject: [PATCH] gnu: pdf: Add fbida

* gnu/packages/pdf.scm (fbida): New variable.
---
 gnu/packages/pdf.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 61fe84e..461472a 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -7,6 +7,7 @@
 ;;; Coypright © 2016 ng0 <n...@we.make.ritual.n0.is>
 ;;; Coypright © 2016 Marius Bakke <mba...@fastmail.com>
 ;;; Coypright © 2016 Ludovic Courtès <l...@gnu.org>
+;;; Coypright © 2016 Julien Lepiller <jul...@lepiller.eu>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -45,6 +46,11 @@
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages backup)
   #:use-module (gnu packages lesstif)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages imagemagick)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages photo)
   #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages qt)
@@ -696,3 +702,51 @@ such as smooth alpha-blended slide transitions.  It provides additional tools
 such as zooming, highlighting an area of the screen, and a tool to navigate
 the PDF pages.")
     (license license:gpl2)))
+
+(define-public fbida
+  (package
+    (name "fbida")
+    (version "2.12")
+    (home-page "https://www.kraxel.org/blog/linux/fbida/";)
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://www.kraxel.org/releases/fbida/";
+                                  name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0bw224vb7jh0lrqaf4jgxk48xglvxs674qcpj5y0axyfbh896cfk"))))
+    (build-system gnu-build-system)
+    (arguments
+      '(#:phases (alist-cons-after
+                  'unpack 'patch-ldconfig
+                  (lambda _
+                   (substitute* "mk/Autoconf.mk"
+                    (("/sbin/ldconfig -p") "echo lib")) #t)
+                  (alist-delete 'configure %standard-phases))
+        #:tests? #f
+        #:make-flags (list "CC=gcc"
+                           (string-append "prefix=" (assoc-ref %outputs "out")))))
+    (inputs `(("libjpeg" ,libjpeg)
+              ("curl" ,curl)
+              ("libtiff" ,libtiff)
+              ("libudev" ,eudev)
+              ("libwebp" ,libwebp)
+              ("libdrm" ,libdrm)
+              ("imagemagick" ,imagemagick)
+              ("giflib" ,giflib)
+              ("glib" ,glib)
+              ("cairo-xcb" ,cairo-xcb)
+              ("freetype" ,freetype)
+              ("fontconfig" ,fontconfig)
+              ("libexif" ,libexif)
+              ("mesa" ,mesa)
+              ("libepoxy" ,libepoxy)
+              ("libpng" ,libpng)
+              ("poppler" ,poppler)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (synopsis "Framebuffer and drm-based image viewer")
+    (description
+      "fbida contains a few applications for viewing and editing images on
+the framebuffer.")
+
+    (license license:gpl2+)))
-- 
2.10.1

Reply via email to