nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: vlc: Use livemedia-utils. 

* 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.
This commit is contained in:
Clément Lassieur 2017-06-01 23:32:43 +02:00
parent fa379a5b45
commit 2aaa57294e
No known key found for this signature in database
GPG Key ID: 89F96D4808F359C7
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/video.scm
View File

@ -660,7 +660,10 @@ audio/video codec library.")
"1a22b913p2227ljz89c4fgjlyln5gcz8z58w32r0wh4srnnd60y4")))) "1a22b913p2227ljz89c4fgjlyln5gcz8z58w32r0wh4srnnd60y4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("git" ,git) ; needed for a test `(("autoconf" ,autoconf)
("automake" ,automake)
("git" ,git) ; needed for a test
("libtool" ,libtool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
;; FIXME: Add optional inputs once available. ;; FIXME: Add optional inputs once available.
(inputs (inputs
@ -688,6 +691,7 @@ audio/video codec library.")
("libxinerama" ,libxinerama) ("libxinerama" ,libxinerama)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("libxpm" ,libxpm) ("libxpm" ,libxpm)
("livemedia-utils" ,livemedia-utils)
("lua" ,lua-5.1) ("lua" ,lua-5.1)
("mesa" ,mesa) ("mesa" ,mesa)
("opus" ,opus) ("opus" ,opus)
@ -715,6 +719,15 @@ audio/video codec library.")
#:phases #:phases
(modify-phases %standard-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 (add-before 'configure 'remove-visual-tests
;; Some of the tests require using the display to test out VLC, ;; Some of the tests require using the display to test out VLC,
;; which fails in our sandboxed build system ;; which fails in our sandboxed build system