03/04: gnu: libmediainfo: Fix usage of libcurl and libtinyxml2.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit a1d841433ef54d93b170f334aa718ea64d0733cc
Author: Michael Rohleder <mike@rohleder.de>
AuthorDate: Wed Jun 9 08:12:40 2021 +0200

    gnu: libmediainfo: Fix usage of libcurl and libtinyxml2.
    
    * 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>
---
 gnu/packages/video.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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