futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: libmediainfo: Fix usage of libcurl and libtinyxml2.

Browse Source 
* gnu/packages/video.scm (libmediainfo): Fix usage of libcurl and libtinyxml2.
[arguments]: Add configure-flags.
[native-inputs]: Move zlib, tinyxml2, curl, libzen to ...
[propagated-inputs]: ... Here.
(mediainfo):
[native-inputs]: Remove zlib, libzen. Move libmediainfo to ...
[inputs]: ... Here.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Michael Rohleder 2021-06-09 08:12:40 +02:00 committed by Ludovic Courtès
parent 8cef92d063
commit a1d841433e
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/video.scm
View File

@ -3850,14 +3850,17 @@ practically any type of media.")
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool) ("libtool" ,libtool)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)))
("zlib" ,zlib) (propagated-inputs
`(("zlib" ,zlib)
("tinyxml2" ,tinyxml2) ("tinyxml2" ,tinyxml2)
("curl" ,curl) ("curl" ,curl) ; In Requires.private of libmediainfo.pc.
("libzen" ,libzen))) ("libzen" ,libzen)))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; see above TODO '(#:tests? #f ; see above TODO
#:configure-flags
(list "--with-libcurl" "--with-libtinyxml2")
#:phases #:phases
;; build scripts not in root of archive ;; build scripts not in root of archive
(modify-phases %standard-phases (modify-phases %standard-phases
@ -3910,10 +3913,9 @@ MPEG-2, MPEG-4, DVD (VOB)...
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool) ("libtool" ,libtool)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)))
("zlib" ,zlib) (inputs
("libmediainfo" ,libmediainfo) `(("libmediainfo" ,libmediainfo)))
("libzen" ,libzen)))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; lacks tests '(#:tests? #f ; lacks tests