EFL, elementary, loaders, players and terminology - round 2

EFL, elementary, loaders, players and terminology - round 2

[Tomáš Čech]

Hi,

thank you for your kind review and your comments.

Changes since previous round:

- efl.scm renamed to enlightenment.scm
- descriptions are descriptive and consist of sentences with
  punctuation
- too long lines were shortened
- lonely parens made friends on previous line
- removed unnecessary input bash
- verified that Makefile.in.in substitution is really needed
- added information about reasons for propagated-inputs and improved
  the list a bit

Thanks in advance for another review round.

S_W

[PATCH 1/5] gnu: Add efl.

[Tomáš Čech]

* gnu/packages/enlightenment.scm: New file
* gnu/packages/enlightenment.scm (efl): New variable.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am                  |   1 +
 gnu/packages/enlightenment.scm | 140 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+)
 create mode 100644 gnu/packages/enlightenment.scm

diff --git a/gnu-system.am b/gnu-system.am
index e42e89a..21847cc 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -90,6 +90,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/elf.scm				\
   gnu/packages/emacs.scm			\
   gnu/packages/enchant.scm			\
+  gnu/packages/enligtenment.scm			\
   gnu/packages/feh.scm                          \
   gnu/packages/file.scm				\
   gnu/packages/firmware.scm			\
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
new file mode 100644
index 0000000..6ea0dd5
--- /dev/null
+++ b/gnu/packages/enlightenment.scm
@@ -0,0 +1,140 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
+;;;
+;;; 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 efl)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages bash)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages curl)
+  #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages fribidi)
+  #:use-module (gnu packages game-development)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages lua)
+  #:use-module (gnu packages openssl)
+  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages photo)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages valgrind)
+  #:use-module (gnu packages xorg))
+
+(define-public efl
+  (package
+    (name "efl")
+    (version "1.13.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://download.enlightenment.org/rel/libs/efl/efl-"
+                    version ".tar.gz"))
+              (sha256
+               (base32 "0mwkxsfi5masiy6qfmdqy1j15cfz7nz8g8jq2bf3w501rpa9gxvz"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("alsa-lib" ,alsa-lib)
+       ("compositeproto" ,compositeproto)
+       ("curl" ,curl)
+       ("giflib" ,giflib)
+       ("gstreamer" ,gstreamer)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("harfbuzz" ,harfbuzz)
+       ("libexif" ,libexif)
+       ("libjpeg" ,libjpeg)
+       ("librsvg" ,librsvg)
+       ("libtiff" ,libtiff)
+       ("libx11" ,libx11)
+       ("libxcomposite" ,libxcomposite)
+       ("libxcursor" ,libxcursor)
+       ("libxdmcp" ,libxdmcp)
+       ("libxext" ,libxext)
+       ("libxi" ,libxi)
+       ("libxkbfile" ,libxkbfile)
+       ("libxinerama" ,libxinerama)
+       ("libxp" ,libxp)
+       ("libxrandr" ,libxrandr)
+       ("libxscrnsaver" ,libxscrnsaver)
+       ("libxtst" ,libxtst)
+       ("mesa" ,mesa)
+       ("printproto" ,printproto)
+       ("scrnsaverproto" ,scrnsaverproto)
+       ("valgrind" ,valgrind)
+       ("xextproto" ,xextproto)
+       ("xinput" ,xinput)
+       ("xpr" ,xpr)
+       ("xproto" ,xproto)))
+    (propagated-inputs
+     ; all these inputs are in package config files in section
+     ; Require.private
+     `(("bullet" ,bullet) ; ephysics.pc
+       ("dbus" ,dbus) ; eldbus.pc
+       ("eudev" ,eudev) ; eeze.pc
+       ("fontconfig" ,fontconfig) ; evas.pc
+       ("freetype" ,freetype) ; evas.pc
+       ("fribidi" ,fribidi) ; evas.pc
+       ("glib" ,glib) ; ecore.pc
+       ("libpng" ,libpng) ; evas.pc, evas-cxx.pc
+       ("libsndfile" ,libsndfile) ; ecore-audio.pc, ecore-audio-cxx.pc
+       ("luajit" ,luajit) ; evas.pc, edje.pc
+       ("openssl" ,openssl) ; eet.pc, ecore-con.pc
+       ("pulseaudio" ,pulseaudio) ; ecore-audio.pc, ecore-audio-cxx.pc
+       ("util-linux" ,util-linux) ; eeze.pc
+       ("zlib" ,zlib))) ; eet.pc
+    (arguments
+     `(#:configure-flags '("--disable-silent-rules")
+       #:phases
+       (alist-cons-before
+        'configure 'patch-config-files
+        (lambda _
+          (substitute* "po/Makefile.in.in"
+            (("/bin/sh") (which "bash"))))
+        %standard-phases)))
+    (home-page "http://www.enlightenment.org")
+    (synopsis "Enlightenment Foundation Libraries")
+    (description
+     "Enlightenment Foundation Libraries is set of libraries developed
+for Enlightenment, but is used for more applications because it is resource
+friendly, energy efficient and good looking.  It consists of:
+
+ * Eina - defining data types and low level abstractions
+ * Eo - generic object concept for EFL
+ * Eet - binary data parser and serializer
+ * Evas - canvas library
+ * Ecore - abstraction to operating system
+ * Embryo - script engine
+ * Escape - Playstation portability layer
+ * Evil - Microsoft Windows portability layer
+ * Eio - library for asynchronous input/output
+ * Eldbus - DBus integration
+ * Efreet - support for Freedesktop.org standards
+ * Eeze - hardware interface
+ * EPhysics - integration of physics engine
+ * Edje - UI layout library, themes support
+ * Emotion - multimedia integration
+ * Ethumb - image thumbnail support")
+    (license (list license:bsd-2 license:lgpl2.1 license:zlib)))) ; different parts under different licenses
-- 
2.0.5

[PATCH 2/5] gnu: Add elementary.

[Tomáš Čech]

* gnu/packages/enlightenment.scm (elementary): New variable.
---
 gnu/packages/enlightenment.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 6ea0dd5..0d7aa79 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -138,3 +138,28 @@ friendly, energy efficient and good looking.  It consists of:
  * Emotion - multimedia integration
  * Ethumb - image thumbnail support")
     (license (list license:bsd-2 license:lgpl2.1 license:zlib)))) ; different parts under different licenses
+
+(define-public elementary
+  (package
+    (name "elementary")
+    (version "1.13.0")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append
+                "http://download.enlightenment.org/rel/libs/elementary/elementary-"
+                version ".tar.gz"))
+              (sha256
+               (base32 "133p4yaynmy37yhk2gxwlc8a2n2wy7cbh4rd7nsnl5929wqb9waj"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("efl" ,efl)))
+    (home-page "http://www.enlightenment.org")
+    (synopsis "Widget library of Enlightenment world")
+    (description
+     "Elementary is widget library/toolkit, part of Enlightenment Foundation
+ Libraries.  It is build upon Edje and Evas libraries and uses full capabilities
+ of EFL.")
+    (license license:lgpl2.1)))
-- 
2.0.5

[PATCH 3/5] gnu: Add evas-generic-loaders

[Tomáš Čech]

* gnu/packages/enlightenment.scm (evas-generic-loaders): New variable.
---
 gnu/packages/enlightenment.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 0d7aa79..9e471bd 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -28,6 +28,7 @@
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages game-development)
+  #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
@@ -36,6 +37,7 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages openssl)
+  #:use-module (gnu packages pdf)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pkg-config)
@@ -163,3 +165,33 @@ friendly, energy efficient and good looking.  It consists of:
  Libraries.  It is build upon Edje and Evas libraries and uses full capabilities
  of EFL.")
     (license license:lgpl2.1)))
+
+(define-public evas-generic-loaders
+  (package
+    (name "evas-generic-loaders")
+    (version "1.13.0")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append
+                "http://download.enlightenment.org/rel/libs/evas_generic_loaders/evas_generic_loaders-"
+                version ".tar.gz"))
+              (sha256
+               (base32 "16yzjk58bxsd0rlnpzrr8as9fxjjiq01swzhpadsgkmq33abgg63"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("gstreamer" ,gstreamer)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("efl" ,efl)
+       ("librsvg" ,librsvg)
+       ("libspectre" ,libspectre)
+       ("poppler" ,poppler)))
+    (home-page "http://www.enlightenment.org")
+    (synopsis "Plugins for integration of various file types into Evas")
+    (description
+     "Evas-generic-loaders is collection of interfaces to outside libraries
+and applications allowing to natively open pictures, documents and media
+files in Evas (EFL canvas library).")
+    (license license:gpl2+)))
-- 
2.0.5

[PATCH 4/5] gnu: Add emotion-generic-players

[Tomáš Čech]

* gnu/packages/enlightenment.scm (emotion-generic-players): New variable.
---
 gnu/packages/enlightenment.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 9e471bd..ebfd0d7 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -42,6 +42,7 @@
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages valgrind)
+  #:use-module (gnu packages video)
   #:use-module (gnu packages xorg))
 
 (define-public efl
@@ -195,3 +196,29 @@ friendly, energy efficient and good looking.  It consists of:
 and applications allowing to natively open pictures, documents and media
 files in Evas (EFL canvas library).")
     (license license:gpl2+)))
+
+(define-public emotion-generic-players
+  (package
+    (name "emotion-generic-players")
+    (version "1.13.0")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append
+                "http://download.enlightenment.org/rel/libs/emotion_generic_players/emotion_generic_players-"
+                version ".tar.gz"))
+              (sha256
+               (base32 "0gin3cjhfj75v0gjsvv7harbj4fs4r7r1sfi74ncxzna71nrd8r3"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("efl" ,efl)
+       ("vlc" ,vlc)))
+    (home-page "http://www.enlightenment.org")
+    (synopsis "Plugins for integrating media players in EFL based applications")
+    (description
+     "Emotion-generic-players is collection of interfaces to outside libraries
+and applications allowing to natively play video files through Emotion.
+The only supported now is VLC.")
+    (license license:bsd-2)))
-- 
2.0.5

[PATCH 5/5] gnu: Add terminology.

[Tomáš Čech]

* gnu/packages/enlightenment.scm (terminology): New variable.
---
 gnu/packages/enlightenment.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index ebfd0d7..73dd369 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -222,3 +222,38 @@ files in Evas (EFL canvas library).")
 and applications allowing to natively play video files through Emotion.
 The only supported now is VLC.")
     (license license:bsd-2)))
+
+(define-public terminology
+  (package
+    (name "terminology")
+    (version "0.8.0")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append
+                "http://download.enlightenment.org/rel/apps/terminology/terminology-"
+                version ".tar.gz"))
+              (sha256
+               (base32 "0a767ixackzmhb2awrhjy7q6vsivsd54wc434i617xiw095x843s"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("efl" ,efl)
+       ("elementary" ,elementary)))
+    (home-page "http://www.enlightenment.org")
+    (synopsis "Powerful terminal emulator based on EFL")
+    (description
+     "Terminology is fast but advanced and feature rich terminal emulator.
+Some of it's features:
+ - support for X and framebuffer (when properly built)
+ - multiple tabs
+ - UTF-8 support
+ - themable - you can change background, cursor, visual bell style,
+   selection, etc.
+ - integrated popup viewer for images, videos, etc.
+ - tycat, tyls, typop tools for non-text contents
+ - history miniview
+ - URL and local path detection
+ - pop-up with gravatar on e-mail addresses")
+    (license license:bsd-2)))
-- 
2.0.5

Re: [PATCH 1/5] gnu: Add efl.

[Andreas Enge]

Hello,

On Sat, Feb 28, 2015 at 11:11:02PM +0100, Tomáš Čech wrote:
> +    (propagated-inputs
> +     ; all these inputs are in package config files in section
> +     ; Require.private

I was under the impression that only libraries given as "Require" needed
to be propagated, and not "Require.private" ones. Maybe someone else can
comment?

You could also try to move them to normal inputs and see whether another
package depending on efl still compiles.

Andreas

Re: [PATCH 1/5] gnu: Add efl.

[tcech]

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

Hello,

On Sun, Mar 01, 2015 at 08:24:54PM +0100, Andreas Enge wrote:
>Hello,
>
>On Sat, Feb 28, 2015 at 11:11:02PM +0100, Tomáš Čech wrote:
>> +    (propagated-inputs
>> +     ; all these inputs are in package config files in section
>> +     ; Require.private
>
>I was under the impression that only libraries given as "Require" needed
>to be propagated, and not "Require.private" ones. Maybe someone else can
>comment?

I don't know pkgconfig much, but when in later packages in configure
tests presence with

$PKG_CONFIG --exists --print-errors "somepackage >= version"

Missing libraries from Require.private leads to failure of configure.

>You could also try to move them to normal inputs and see whether another
>package depending on efl still compiles.

I'm afraid that I found what propagated-input is thanks to this. I'm
sure that elementary or others won't build without that.

Maybe I misunderstand the problem though.

S_W

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

Re: [PATCH 1/5] gnu: Add efl.

[Andreas Enge]

On Sun, Mar 01, 2015 at 08:43:09PM +0100, tcech@suse.cz wrote:
> On Sun, Mar 01, 2015 at 08:24:54PM +0100, Andreas Enge wrote:
> >You could also try to move them to normal inputs and see whether another
> >package depending on efl still compiles.
> I'm afraid that I found what propagated-input is thanks to this. I'm
> sure that elementary or others won't build without that.

Sorry, what I suggested as a test actually does not work. The question is:
Does everything built with efl requires the additional libraries, or may
there be packages building with efl, but without these additional libraries?
Of course, no finite number of examples constitutes a proof...

I found the following:
   http://people.freedesktop.org/~dbn/pkg-config-guide.html
Requires: A list of packages required by this package. The versions of these packages may be specified using the comparison operators =, <, >, <= or >=.
Requires.private: A list of private packages required by this package but not exposed to applications. The version specific rules from the Requires field also apply here.

This sounds as if only "Requires" libraries need to be propagated, whereas
"Requires.private" libraries are already handled by our ld wrapper.

The page above links to the following:
   https://wiki.openmandriva.org/en/Overlinking_issues_in_packaging

This seems to confirm my opinion, but it would be good if someone more
knowledgeable on pkg-config could comment on the issue.

Andreas

Re: [PATCH 1/5] gnu: Add efl.

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> I was under the impression that only libraries given as "Require" needed
> to be propagated, and not "Require.private" ones. Maybe someone else can
> comment?

It’s worth propagating in both cases.  “Require.private” is used for
static linking only, as in ‘pkg-config foo --libs --static’.

Ludo’.

Re: [PATCH 1/5] gnu: Add efl.

[Ludovic Courtès]

Tomáš Čech <sleep_walker@suse.cz> skribis:

> * gnu/packages/enlightenment.scm: New file
> * gnu/packages/enlightenment.scm (efl): New variable.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.

[...]

> +    (propagated-inputs
> +     ; all these inputs are in package config files in section
> +     ; Require.private

Please use two semicolons for comments like this one.  Capitalize
sentences and add a period at the end.

> +       (alist-cons-before
> +        'configure 'patch-config-files
> +        (lambda _
> +          (substitute* "po/Makefile.in.in"
> +            (("/bin/sh") (which "bash"))))

I persist to think that this is not needed, is it?  If not, please
remove it.

> +    (description
> +     "Enlightenment Foundation Libraries is set of libraries developed
> +for Enlightenment, but is used for more applications because it is resource
> +friendly, energy efficient and good looking.  It consists of:
> +
> + * Eina - defining data types and low level abstractions
> + * Eo - generic object concept for EFL
> + * Eet - binary data parser and serializer
> + * Evas - canvas library
> + * Ecore - abstraction to operating system
> + * Embryo - script engine
> + * Escape - Playstation portability layer
> + * Evil - Microsoft Windows portability layer
> + * Eio - library for asynchronous input/output
> + * Eldbus - DBus integration
> + * Efreet - support for Freedesktop.org standards
> + * Eeze - hardware interface
> + * EPhysics - integration of physics engine
> + * Edje - UI layout library, themes support
> + * Emotion - multimedia integration
> + * Ethumb - image thumbnail support")

You’ll hate me for saying that ;-) but please make it just a plain
paragraph: the UIs may reformat the paragraph to their without caring
for the bullet list.

The text probably doesn’t need to be exhaustive, just to list some of
the main functionality.

> +    (license (list license:bsd-2 license:lgpl2.1 license:zlib)))) ; different parts under different licenses

Line too long.

OK to push with these changes.

Thanks!

Ludo’.

Re: [PATCH 2/5] gnu: Add elementary.

[Ludovic Courtès]

Tomáš Čech <sleep_walker@suse.cz> skribis:

> * gnu/packages/enlightenment.scm (elementary): New variable.

[...]

> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)))
> +    (inputs
> +     `(("efl" ,efl)))

If Elementary headers include EFL headers, of if its .pc refers to
efl.pc, then EFL should be propagated.

OK to commit with this adjusted as needed!

Thanks,
Ludo’.

Re: [PATCH 3/5] gnu: Add evas-generic-loaders

[Ludovic Courtès]

Tomáš Čech <sleep_walker@suse.cz> skribis:

> * gnu/packages/enlightenment.scm (evas-generic-loaders): New variable.

[...]

> +       ("efl" ,efl)

Propagate?

> +    (description
> +     "Evas-generic-loaders is collection of interfaces to outside libraries
> +and applications allowing to natively open pictures, documents and media
                           ^^^^^
“allowing pictures to be opened”

OK to push with this change.

Ludo’.

Re: [PATCH 4/5] gnu: Add emotion-generic-players

[Ludovic Courtès]

Tomáš Čech <sleep_walker@suse.cz> skribis:

> * gnu/packages/enlightenment.scm (emotion-generic-players): New variable.

[...]

> +    (inputs
> +     `(("efl" ,efl)

Propagate?

> +     "Emotion-generic-players is collection of interfaces to outside libraries
> +and applications allowing to natively play video files through Emotion.

“allowing videos to be played”

Other than that, OK.

Ludo’.

Re: [PATCH 5/5] gnu: Add terminology.

[Ludovic Courtès]

Tomáš Čech <sleep_walker@suse.cz> skribis:

> * gnu/packages/enlightenment.scm (terminology): New variable.

[...]

> +    (inputs
> +     `(("efl" ,efl)
> +       ("elementary" ,elementary)))

Propagate?

> +    (description
> +     "Terminology is fast but advanced and feature rich terminal emulator.
> +Some of it's features:
> + - support for X and framebuffer (when properly built)
> + - multiple tabs
> + - UTF-8 support
> + - themable - you can change background, cursor, visual bell style,
> +   selection, etc.
> + - integrated popup viewer for images, videos, etc.
> + - tycat, tyls, typop tools for non-text contents
> + - history miniview
> + - URL and local path detection
> + - pop-up with gravatar on e-mail addresses")

No bullet list please.

OK to push with this change.

Thank you!

Ludo’.