unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Michael Rohleder <mike@rohleder.de>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 48194@debbugs.gnu.org
Subject: [bug#48194] [PATCH] gnu: libmediainfo: Fix usage of libcurl and libtinyxml2.
Date: Wed, 09 Jun 2021 08:27:52 +0200	[thread overview]
Message-ID: <87im2n7dsn.fsf@rohleder.de> (raw)
In-Reply-To: <875yyrku96.fsf_-_@gnu.org> ("Ludovic Courtès"'s message of "Sun, 06 Jun 2021 15:17:09 +0200")


[-- Attachment #1.1: Type: text/plain, Size: 99 bytes --]

Hey Ludo!

Thanks for the ping and sorry for the delay!

I hope, this patch is better/pushable ;)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Fix usage of libcurl and linyxml2. --]
[-- Type: text/x-patch, Size: 2008 bytes --]

>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


[-- Attachment #1.3: Type: text/plain, Size: 132 bytes --]



-- 
I've finally learned what "upward compatible" means.  It means we get to
keep all our old mistakes.    Dennie van Tassel

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]

  reply	other threads:[~2021-06-09  6:29 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-03 15:20 [bug#48194] [PATCH] gnu: libmediainfo: Fix usage of libcurl and libtinyxml2 Michael Rohleder
2021-05-11 10:31 ` bug#48194: " Ludovic Courtès
2021-05-11 10:51 ` [bug#48194] " Ludovic Courtès
2021-05-11 12:14   ` Michael Rohleder
2021-05-11 12:30     ` Ludovic Courtès
2021-06-06 13:17       ` Ludovic Courtès
2021-06-09  6:27         ` Michael Rohleder [this message]
2021-06-11 22:40           ` bug#48194: " Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87im2n7dsn.fsf@rohleder.de \
    --to=mike@rohleder.de \
    --cc=48194@debbugs.gnu.org \
    --cc=ludo@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).