[PATCH] add fbida

[PATCH] add fbida

[Julien Lepiller]

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

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.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-fbida.patch --]
[-- Type: text/x-patch, Size: 4524 bytes --]

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

* gnu/packages/fbida.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MOULES): Add it.
---
 gnu/local.mk           |  1 +
 gnu/packages/fbida.scm | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 gnu/packages/fbida.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index a9343f0..91dc42a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -117,6 +117,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/enlightenment.scm		\
   %D%/packages/entr.scm				\
   %D%/packages/erlang.scm			\
+  %D%/packages/fbida.scm                        \
   %D%/packages/fcitx.scm			\
   %D%/packages/feh.scm                          \
   %D%/packages/figlet.scm			\
diff --git a/gnu/packages/fbida.scm b/gnu/packages/fbida.scm
new file mode 100644
index 0000000..a5efdc7
--- /dev/null
+++ b/gnu/packages/fbida.scm
@@ -0,0 +1,85 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages fbida)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages imagemagick)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages pdf)
+  #:use-module (gnu packages photo)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module ((guix licenses) #:prefix license:))
+
+(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.9.2

Re: [PATCH] add fbida

[Kei Kebreau]

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

Julien Lepiller <julien@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!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]

Re: [PATCH] add fbida

[Julien Lepiller]

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

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

> Julien Lepiller <julien@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.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-pdf-Add-fbida.patch --]
[-- Type: text/x-patch, Size: 3346 bytes --]

From b86ec5a8d7a936c76aa6c0b5ccc620e1d1bbf418 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@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 <ng0@we.make.ritual.n0.is>
 ;;; Coypright © 2016 Marius Bakke <mbakke@fastmail.com>
 ;;; Coypright © 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Coypright © 2016 Julien Lepiller <julien@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

Re: [PATCH] add fbida

[Kei Kebreau]

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

Julien Lepiller <julien@lepiller.eu> writes:

> On Sat, 15 Oct 2016 16:51:00 -0400
> Kei Kebreau <kei@openmailbox.org> wrote:
>
>> Julien Lepiller <julien@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.

Thanks! This works just as well for me. Pushed as
f3e222165e7c2393441346d4efd82d03a84a1fac.

For future reference, when adding a package you only need

gnu: Add [package].
* gnu/packages/[file].scm ([package]): New variable.

as far as commit syntax goes. :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]