diff mbox series

[bug#48194] gnu: libmediainfo: Fix usage of libcurl and libtinyxml2.

Message ID 87im2n7dsn.fsf@rohleder.de
State Accepted
Headers show
Series [bug#48194] gnu: libmediainfo: Fix usage of libcurl and libtinyxml2. | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Michael Rohleder June 9, 2021, 6:27 a.m. UTC 
Hey Ludo!

Thanks for the ping and sorry for the delay!

I hope, this patch is better/pushable ;)

Comments

Ludovic Courtès June 11, 2021, 10:40 p.m. UTC | #1 
Hi,

Michael Rohleder <mike@rohleder.de> skribis:

>>From 7e998af5b498388e5ffcf2491c6c934bf49b5c98 Mon Sep 17 00:00:00 2001
> From: Michael Rohleder <mike@rohleder.de>
> Date: Wed, 9 Jun 2021 08:12:40 +0200
> Subject: [PATCH] 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.

Applied, thanks!

Ludo’.
diff mbox series

Patch

>From 7e998af5b498388e5ffcf2491c6c934bf49b5c98 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@rohleder.de>
Date: Wed, 9 Jun 2021 08:12:40 +0200
Subject: [PATCH] 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.
---
 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 a694d4bb43..5c028016cf 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
-- 
2.32.0