[PATCH] gnu: Add quvi.

[PATCH] gnu: Add quvi.

[Taylan Ulrich Bayırlı/Kammer]

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

This actually adds three packages but they're closely tied together.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 3826 bytes --]

From 5e10d1af45eceff13d764e6b13cc3498477b080d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
Date: Wed, 4 Mar 2015 22:35:53 +0100
Subject: [PATCH 4/5] gnu: Add quvi.

* gnu/packages/web.scm (libquvi-scripts, libquvi, quvi): New variables.
---
 gnu/packages/web.scm | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 5f91751..d6144b9 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -36,11 +36,14 @@
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages autotools)
   #:use-module ((gnu packages compression) #:select (zlib))
+  #:use-module (gnu packages cyrus-sasl)
   #:use-module (gnu packages openssl)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages icu4c)
+  #:use-module (gnu packages lua)
   #:use-module (gnu packages which)
   #:use-module (gnu packages pcre)
+  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages perl)
@@ -817,3 +820,76 @@ of people.")
     (description
      "LibYAML is a YAML 1.1 parser and emitter written in C.")
     (license l:expat)))
+
+(define-public libquvi-scripts
+  (package
+    (name "libquvi-scripts")
+    (version "0.4.21")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://sourceforge/quvi/libquvi-scripts-" version ".tar.xz"))
+       (sha256
+        (base32 "0d0giry6bb57pnidymvdl7i5x9bq3ljk3g4bs294hcr5mj3cq0kw"))))
+    (build-system gnu-build-system)
+    (home-page "http://quvi.sourceforge.net/")
+    (synopsis "Media stream URL parser")
+    (description "This package contains the support scripts called upon by
+libquvi to parse media stream properties.")
+    (license l:lgpl2.1+)))
+
+(define-public libquvi
+  (package
+    (name "libquvi")
+    (version "0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://sourceforge/quvi/libquvi-" version ".tar.xz"))
+       (sha256
+        (base32 "00x9gbmzc5cns0gnfag0hsphcr3cb33vbbb9s7ppvvd6bxz2z1mm"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("curl" ,curl)
+       ("cyrus-sasl" ,cyrus-sasl)
+       ("libquvi-scripts" ,libquvi-scripts)
+       ("lua" ,lua-5.1)
+       ("openssl" ,openssl)
+       ("zlib" ,zlib)))
+    (arguments
+     ;; Lua provides no .pc file, so add CFLAGS/LIBS manually.
+     '(#:configure-flags
+       (let ((lua (assoc-ref %build-inputs "lua")))
+         (list
+          (string-append "liblua_CFLAGS=-I" lua "/include")
+          (string-append "liblua_LIBS=-L" lua "/libs -llua")))))
+    (home-page "http://quvi.sourceforge.net/")
+    (synopsis "Media stream URL parser")
+    (description "libquvi is a library with a C API for parsing media stream
+URLs and extracting their actual media files.")
+    (license l:lgpl2.1+)))
+
+(define-public quvi
+  (package
+    (name "quvi")
+    (version "0.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://sourceforge/quvi/quvi-" version ".tar.xz"))
+       (sha256
+        (base32 "09lhl6dv5zpryasx7yjslfrcdcqlsbwapvd5lg7w6sm5x5n3k8ci"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("curl" ,curl)
+       ("libquvi" ,libquvi)))
+    (home-page "http://quvi.sourceforge.net/")
+    (synopsis "Media stream URL parser")
+    (description "quvi is a command-line-tool suite to extract media files
+from streaming URLs.  It is a command-line wrapper for the libquvi library.")
+    (license l:lgpl2.1+)))
-- 
2.2.1

Re: [PATCH] gnu: Add quvi.

[Andreas Enge]

On Wed, Mar 04, 2015 at 11:00:56PM +0100, Taylan Ulrich Bayırlı/Kammer wrote:
> This actually adds three packages but they're closely tied together.

Still, could you commit them as three separate packages?

> +    (description "This package contains the support scripts called upon by
> +libquvi to parse media stream properties.")

"called" instead of "called upon"?

> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "mirror://sourceforge/quvi/libquvi-" version ".tar.xz"))
> +       (sha256
> +        (base32 "00x9gbmzc5cns0gnfag0hsphcr3cb33vbbb9s7ppvvd6bxz2z1mm"))))

Your indentation (here and further down) is not quite consistens, sometimes
it it one, sometimes two spaces.

> +          (string-append "liblua_CFLAGS=-I" lua "/include")
> +          (string-append "liblua_LIBS=-L" lua "/libs -llua")))))

These are two flags and should be two entries in the list.

Apart from that, they look good to push.

Andreas

Re: [PATCH] gnu: Add quvi.

[Mark H Weaver]

Andreas Enge <andreas@enge.fr> writes:

> On Wed, Mar 04, 2015 at 11:00:56PM +0100, Taylan Ulrich Bayırlı/Kammer wrote:
>> This actually adds three packages but they're closely tied together.
>
> Still, could you commit them as three separate packages?

I'm familiar with these packages, and I tend to agree that they are so
closely tied that it's reasonable to commit them together.

>> +     (origin
>> +       (method url-fetch)
>> +       (uri (string-append
>> +             "mirror://sourceforge/quvi/libquvi-" version ".tar.xz"))
>> +       (sha256
>> +        (base32 "00x9gbmzc5cns0gnfag0hsphcr3cb33vbbb9s7ppvvd6bxz2z1mm"))))
>
> Your indentation (here and further down) is not quite consistens, sometimes
> it it one, sometimes two spaces.

He's using the auto-indenter of Emacs Scheme Mode, which faithfully
follows the rules in our .dir-locals.el file.

>> +          (string-append "liblua_CFLAGS=-I" lua "/include")
>> +          (string-append "liblua_LIBS=-L" lua "/libs -llua")))))
>
> These are two flags and should be two entries in the list.

What Taylan wrote above looks right to me.  The -L[...] and -llua are
two flags, but the variable setting "liblua_LIBS=-L[...]/libs -llua"
needs to be one argument to configure.

     Thanks,
       Mark

Re: [PATCH] gnu: Add quvi.

[Andreas Enge]

On Fri, Mar 06, 2015 at 05:47:26PM -0500, Mark H Weaver wrote:
> I'm familiar with these packages, and I tend to agree that they are so
> closely tied that it's reasonable to commit them together.

That is not common practice so far, no? I do not see what would be
the problem when committing them separately.

> > Your indentation (here and further down) is not quite consistens, sometimes
> > it it one, sometimes two spaces.
> He's using the auto-indenter of Emacs Scheme Mode, which faithfully
> follows the rules in our .dir-locals.el file.

Curious. Why does it use sometimes one, sometimes two spaces? Can this be
explained so that non-emacs users follow the same style?

> >> +          (string-append "liblua_LIBS=-L" lua "/libs -llua")))))
> > These are two flags and should be two entries in the list.
> What Taylan wrote above looks right to me.  The -L[...] and -llua are
> two flags, but the variable setting "liblua_LIBS=-L[...]/libs -llua"
> needs to be one argument to configure.

I do not get this. Why should two flags be one argument? Do you mean that
on the command line, one would write:
  ./configure "liblua_LIBS=-L/gnu/store/.../libs -llua"
and that the call of system* adds these quotation marks implicitly?

Andreas

Re: [PATCH] gnu: Add quvi.

[Mark H Weaver]

Andreas Enge <andreas@enge.fr> writes:

> On Fri, Mar 06, 2015 at 05:47:26PM -0500, Mark H Weaver wrote:
>> I'm familiar with these packages, and I tend to agree that they are so
>> closely tied that it's reasonable to commit them together.
>
> That is not common practice so far, no? I do not see what would be
> the problem when committing them separately.

I don't feel strongly either way.

>> > Your indentation (here and further down) is not quite consistens, sometimes
>> > it it one, sometimes two spaces.
>> He's using the auto-indenter of Emacs Scheme Mode, which faithfully
>> follows the rules in our .dir-locals.el file.
>
> Curious. Why does it use sometimes one, sometimes two spaces? Can this be
> explained so that non-emacs users follow the same style?

I think we're trying to be tolerant of some inconsistency in
indentation, but the usual rule is that continuation lines within a
parenthesized list are lined up with the first argument (second list
item) on the first line, or if the first line only contains one list
item, then they are all lined up.  However, if there's an entry in
.dir-locals.el, then it is considered a special form and is indented two
spaces.

>> >> +          (string-append "liblua_LIBS=-L" lua "/libs -llua")))))
>> > These are two flags and should be two entries in the list.
>> What Taylan wrote above looks right to me.  The -L[...] and -llua are
>> two flags, but the variable setting "liblua_LIBS=-L[...]/libs -llua"
>> needs to be one argument to configure.
>
> I do not get this. Why should two flags be one argument? Do you mean that
> on the command line, one would write:
>   ./configure "liblua_LIBS=-L/gnu/store/.../libs -llua"

Yes.

> and that the call of system* adds these quotation marks implicitly?

It doesn't add quotation marks implicitly, but it does the same thing
that the shell would do if quotation marks were added, namely that the
entire quoted item is passed as a single argument to ./configure.

If they were instead passed as two arguments, as would be done with the
command

  ./configure liblua_LIBS=-L/gnu/store/.../libs -llua

Then the 'liblua_LIBS' variable would be "-L/gnu/store/.../libs" and
"-llua" would be passed as a separate argument to configure, which
certainly wouldn't do what we want and might raise an error.

      Mark

Re: [PATCH] gnu: Add quvi.

[Andreas Enge]

Okay, thanks for the explanations!

Andreas