unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "Clément Lassieur" <clement@lassieur.org>
To: 27224@debbugs.gnu.org
Subject: bug#27224: [PATCH 2/4] gnu: vlc: Use livemedia-utils.
Date: Sun,  4 Jun 2017 01:33:46 +0200	[thread overview]
Message-ID: <20170603233348.7884-2-clement@lassieur.org> (raw)
In-Reply-To: <20170603233348.7884-1-clement@lassieur.org>

* 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

  reply	other threads:[~2017-06-03 23:35 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-03 23:27 bug#27224: vlc: add support pour RTSP Clément Lassieur
2017-06-03 23:33 ` bug#27224: [PATCH 1/4] gnu: Add livemedia-utils Clément Lassieur
2017-06-03 23:33   ` Clément Lassieur [this message]
2017-06-03 23:33   ` bug#27224: [PATCH 3/4] gnu: Add libdvbpsi Clément Lassieur
2017-06-03 23:33   ` bug#27224: [PATCH 4/4] gnu: vlc: Use libdvbpsi Clément Lassieur
2017-06-04  3:00 ` bug#27224: vlc: add support pour RTSP Leo Famulari
2017-06-04  8:25   ` Clément Lassieur
2017-06-07 12:05     ` Clément Lassieur

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170603233348.7884-2-clement@lassieur.org \
    --to=clement@lassieur.org \
    --cc=27224@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).