2 files changed, 39 insertions(+), 1 deletions(-)

M gnu/packages/video.scm
M gnu/packages/web.scm

@@ 63,6 63,7 @@
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages texlive)
   #:use-module (gnu packages version-control)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)


@@ 177,6 178,7 @@ SMPTE 314M.")
        ("lame" ,lame)
        ("libbluray" ,libbluray)
        ("libcaca" ,libcaca)
+       ("libquvi" ,libquvi)
        ("libtheora" ,libtheora)
        ("libvorbis" ,libvorbis)
        ("libvpx" ,libvpx)


@@ 239,7 241,6 @@ SMPTE 314M.")
 ;;   --enable-libopencv       enable video filtering via libopencv [no]
 ;;   --enable-libopenjpeg     enable JPEG 2000 de/encoding via OpenJPEG [no]
 ;;   --enable-libpulse        enable Pulseaudio input via libpulse [no]
-;;   --enable-libquvi         enable quvi input via libquvi [no]
 ;;   --enable-librtmp         enable RTMP[E] support via librtmp [no]
 ;;   --enable-libschroedinger enable Dirac de/encoding via libschroedinger [no]
 ;;   --enable-libshine        enable fixed-point MP3 encoding via libshine [no]


@@ 271,6 272,7 @@ SMPTE 314M.")
                       "--enable-libfreetype"
                       "--enable-libmp3lame"
                       "--enable-libopus"
+                      "--enable-libquvi"
                       "--enable-libsoxr"
                       "--enable-libspeex"
                       "--enable-libtheora"

@@ 36,11 36,14 @@
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages compression)
+  #: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 base)
   #: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)


@@ 835,3 838,36 @@ of people.")
     (description "This package contains support scripts called 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+)))