From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHIZX-0001UW-3o for guix-patches@gnu.org; Sat, 03 Jun 2017 19:35:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHIZS-0001OG-S3 for guix-patches@gnu.org; Sat, 03 Jun 2017 19:35:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51689) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHIZS-0001O1-OS for guix-patches@gnu.org; Sat, 03 Jun 2017 19:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dHIZS-0005Y4-Ja for guix-patches@gnu.org; Sat, 03 Jun 2017 19:35:02 -0400 Subject: bug#27224: [PATCH 2/4] gnu: vlc: Use livemedia-utils. Resent-Message-ID: From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Date: Sun, 4 Jun 2017 01:33:46 +0200 Message-Id: <20170603233348.7884-2-clement@lassieur.org> In-Reply-To: <20170603233348.7884-1-clement@lassieur.org> References: <20170603233348.7884-1-clement@lassieur.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27224@debbugs.gnu.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