bug#27224: vlc: add support pour RTSP

bug#27224: vlc: add support pour RTSP

[Clément Lassieur]

Hi,

Those four patches add support for RTSP to VLC.

livemedia-utils makes it possible to read this example stream:
rtsp://mpv.cdn3.bigCDN.com:554/bigCDN/_definst_/mp4:bigbuckbunnyiphone_400.mp4.

But for other streams, like those listed at
http://mafreebox.freebox.fr/freeboxtv/playlist.m3u, libdvbpsi is needed
as well.  (I'm afraid one probably needs to be in the Free (free.fr)
network to access the streams.)

bug#27224: [PATCH 1/4] gnu: Add livemedia-utils.

[Clément Lassieur]

* gnu/packages/video.scm (livemedia-utils): New variable.
---
 gnu/packages/video.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index ac2eec5f9..95f17462d 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -19,6 +19,7 @@
 ;;; Copyright © 2017 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
+;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2153,3 +2154,43 @@ MPEG-2, MPEG-4, DVD (VOB)...
 information and other metadata about audio or video files.  It supports the
 many codecs and formats supported by libmediainfo.")
     (license license:bsd-2)))
+
+(define-public livemedia-utils
+  (package
+    (name "livemedia-utils")
+    (version "2017.05.24")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://www.live555.com/liveMedia/public/live."
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "1ra64j3qa89hf3xika8jz9gd8al8mcaqlk5ivw5pclnd2df5f4im"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f ; no tests
+       #:make-flags (list "CC=gcc"
+                          (string-append "LDFLAGS=-Wl,-rpath="
+                                         (assoc-ref %outputs "out") "/lib")
+                          (string-append "PREFIX="
+                                         (assoc-ref %outputs "out")))
+       #:phases (modify-phases %standard-phases
+                  (add-before 'configure 'fix-makefiles-generation
+                    (lambda _
+                      (substitute* "genMakefiles"
+                        (("/bin/rm") "rm"))
+                      #t))
+                  (replace 'configure
+                    (lambda _
+                      (zero? (system* "./genMakefiles"
+                                      "linux-with-shared-libraries")))))))
+    (home-page "http://www.live555.com/liveMedia/")
+    (synopsis "Set of C++ libraries for multimedia streaming")
+    (description "This code forms a set of C++ libraries for multimedia
+streaming, using open standard protocols (RTP/RTCP, RTSP, SIP).  The libraries
+can be used to stream, receive, and process MPEG, H.265, H.264, H.263+, DV or
+JPEG video, and several audio codecs.  They can easily be extended to support
+additional (audio and/or video) codecs, and can also be used to build basic
+RTSP or SIP clients and servers.")
+    (license license:lgpl3+)))
-- 
2.13.0

bug#27224: [PATCH 2/4] gnu: vlc: Use livemedia-utils.

[Clément Lassieur]

* gnu/packages/video.scm (vlc)[inputs]: Add livemedia-utils.
[native-inputs]: Add autoconf, automake and libtool.
[arguments]: Add bootstrap and fix-livemedia-utils-prefix phases.
---
 gnu/packages/video.scm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 95f17462d..8b8140eb9 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -660,7 +660,10 @@ audio/video codec library.")
                "1a22b913p2227ljz89c4fgjlyln5gcz8z58w32r0wh4srnnd60y4"))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("git" ,git) ; needed for a test
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("git" ,git) ; needed for a test
+       ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)))
     ;; FIXME: Add optional inputs once available.
     (inputs
@@ -688,6 +691,7 @@ audio/video codec library.")
        ("libxinerama" ,libxinerama)
        ("libxml2" ,libxml2)
        ("libxpm" ,libxpm)
+       ("livemedia-utils" ,livemedia-utils)
        ("lua" ,lua-5.1)
        ("mesa" ,mesa)
        ("opus" ,opus)
@@ -715,6 +719,15 @@ audio/video codec library.")
 
        #:phases
        (modify-phases %standard-phases
+         (add-before 'configure 'bootstrap
+           (lambda _ (zero? (system* "sh" "bootstrap"))))
+         (add-before 'bootstrap 'fix-livemedia-utils-prefix
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((livemedia-utils (assoc-ref inputs "livemedia-utils")))
+               (substitute* "configure.ac"
+                 (("LIVE555_PREFIX=\\$\\{LIVE555_PREFIX-\"/usr\"\\}")
+                  (string-append "LIVE555_PREFIX=" livemedia-utils)))
+               #t)))
          (add-before 'configure 'remove-visual-tests
            ;; Some of the tests require using the display to test out VLC,
            ;; which fails in our sandboxed build system
-- 
2.13.0

bug#27224: [PATCH 3/4] gnu: Add libdvbpsi.

[Clément Lassieur]

* gnu/packages/video.scm (libdvbpsi): New variable.
---
 gnu/packages/video.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 8b8140eb9..af05a40bf 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2207,3 +2207,24 @@ JPEG video, and several audio codecs.  They can easily be extended to support
 additional (audio and/or video) codecs, and can also be used to build basic
 RTSP or SIP clients and servers.")
     (license license:lgpl3+)))
+
+(define-public libdvbpsi
+  (package
+    (name "libdvbpsi")
+    (version "1.3.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://download.videolan.org/pub/libdvbpsi/"
+                    version "/libdvbpsi-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0824r08kaspbrrg2dd5d46s475zb7j59brqkm2y6x3mdsnpng0yn"))))
+    (build-system gnu-build-system)
+    (home-page "https://www.videolan.org/developers/libdvbpsi.html")
+    (synopsis "Library for decoding and generation of MPEG TS and DVB PSI
+tables")
+    (description "libdvbpsi is a simple library designed for decoding and
+generation of MPEG TS and DVB PSI tables according to standards ISO/IEC 13818s
+and ITU-T H.222.0.")
+    (license license:lgpl2.1)))
-- 
2.13.0

bug#27224: [PATCH 4/4] gnu: vlc: Use libdvbpsi.

[Clément Lassieur]

* gnu/packages/video.scm (vlc)[inputs]: Add libdvbpsi.
---
 gnu/packages/video.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index af05a40bf..909d23ad2 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -677,6 +677,7 @@ audio/video codec library.")
        ("gnutls" ,gnutls)
        ("liba52" ,liba52)
        ("libcddb" ,libcddb)
+       ("libdvbpsi" ,libdvbpsi)
        ("libgcrypt" ,libgcrypt)
        ("libkate" ,libkate)
        ("libmad" ,libmad)
-- 
2.13.0

bug#27224: vlc: add support pour RTSP

[Leo Famulari]

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

On Sun, Jun 04, 2017 at 01:27:14AM +0200, Clément Lassieur wrote:
> Hi,
> 
> Those four patches add support for RTSP to VLC.
> 
> livemedia-utils makes it possible to read this example stream:
> rtsp://mpv.cdn3.bigCDN.com:554/bigCDN/_definst_/mp4:bigbuckbunnyiphone_400.mp4.
> 
> But for other streams, like those listed at
> http://mafreebox.freebox.fr/freeboxtv/playlist.m3u, libdvbpsi is needed
> as well.  (I'm afraid one probably needs to be in the Free (free.fr)
> network to access the streams.)

These patches LGTM, thanks! I'm assuming the new packages are most recent
upstream versions, and that you've checked the licenses.

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

bug#27224: vlc: add support pour RTSP

[Clément Lassieur]

Leo Famulari <leo@famulari.name> writes:

> On Sun, Jun 04, 2017 at 01:27:14AM +0200, Clément Lassieur wrote:
>> Hi,
>> 
>> Those four patches add support for RTSP to VLC.
>> 
>> livemedia-utils makes it possible to read this example stream:
>> rtsp://mpv.cdn3.bigCDN.com:554/bigCDN/_definst_/mp4:bigbuckbunnyiphone_400.mp4.
>> 
>> But for other streams, like those listed at
>> http://mafreebox.freebox.fr/freeboxtv/playlist.m3u, libdvbpsi is needed
>> as well.  (I'm afraid one probably needs to be in the Free (free.fr)
>> network to access the streams.)
>
> These patches LGTM, thanks! I'm assuming the new packages are most recent
> upstream versions, and that you've checked the licenses.

Yes, and yes :-)  Thanks for the review!  Pushed.

bug#27224: vlc: add support pour RTSP

[Clément Lassieur]

Clément Lassieur <clement@lassieur.org> writes:

> Leo Famulari <leo@famulari.name> writes:
>
>> On Sun, Jun 04, 2017 at 01:27:14AM +0200, Clément Lassieur wrote:
>>> Hi,
>>> 
>>> Those four patches add support for RTSP to VLC.
>>> 
>>> livemedia-utils makes it possible to read this example stream:
>>> rtsp://mpv.cdn3.bigCDN.com:554/bigCDN/_definst_/mp4:bigbuckbunnyiphone_400.mp4.
>>> 
>>> But for other streams, like those listed at
>>> http://mafreebox.freebox.fr/freeboxtv/playlist.m3u, libdvbpsi is needed
>>> as well.  (I'm afraid one probably needs to be in the Free (free.fr)
>>> network to access the streams.)
>>
>> These patches LGTM, thanks! I'm assuming the new packages are most recent
>> upstream versions, and that you've checked the licenses.
>
> Yes, and yes :-)  Thanks for the review!  Pushed.

livemedia-utils source is not a permanent link.  Upstream just released
a new version, so the 2017.05.24 link is dead (thanks reepca for
reporting it).  I just updated the version as a temporary fix.

I went on #videolan and thresh told me about
http://download.videolan.org/contrib/live555/, which contains livemedia
archives (done with a script using Debian's watch).  I think we should
use this link instead, I'll send a patch tonight.