From patchwork Wed Jun 9 06:27:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rohleder X-Patchwork-Id: 30070 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E791B27BC78; Wed, 9 Jun 2021 07:29:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4FF3427BC81 for ; Wed, 9 Jun 2021 07:29:09 +0100 (BST) Received: from localhost ([::1]:57358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqri8-0004I5-Af for patchwork@mira.cbaines.net; Wed, 09 Jun 2021 02:29:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqri2-0004Hg-E0 for guix-patches@gnu.org; Wed, 09 Jun 2021 02:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48772) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqri2-0007Hp-5O for guix-patches@gnu.org; Wed, 09 Jun 2021 02:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lqri1-0005kk-W7 for guix-patches@gnu.org; Wed, 09 Jun 2021 02:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48194] [PATCH] gnu: libmediainfo: Fix usage of libcurl and libtinyxml2. Resent-From: Michael Rohleder Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Jun 2021 06:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48194 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 48194@debbugs.gnu.org Received: via spool by 48194-submit@debbugs.gnu.org id=B48194.162322009622059 (code B ref 48194); Wed, 09 Jun 2021 06:29:01 +0000 Received: (at 48194) by debbugs.gnu.org; 9 Jun 2021 06:28:16 +0000 Received: from localhost ([127.0.0.1]:60318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqrhI-0005ji-Fw for submit@debbugs.gnu.org; Wed, 09 Jun 2021 02:28:16 -0400 Received: from wp224.webpack.hosteurope.de ([80.237.132.231]:39166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lqrhD-0005jX-C6 for 48194@debbugs.gnu.org; Wed, 09 Jun 2021 02:28:14 -0400 Received: from www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1lqrhB-0001po-EW; Wed, 09 Jun 2021 08:28:09 +0200 Received: from [192.168.1.3] (helo=micha) by www.rohleder.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1lqrh3-0004da-9M; Wed, 09 Jun 2021 08:28:09 +0200 From: Michael Rohleder References: <20210503152034.31389-1-mike@rohleder.de> <87h7j91r2r.fsf@gnu.org> <874kf979i1.fsf_-_@rohleder.de> <87v97pzc41.fsf@gnu.org> <875yyrku96.fsf_-_@gnu.org> Date: Wed, 09 Jun 2021 08:27:52 +0200 In-Reply-To: <875yyrku96.fsf_-_@gnu.org> ("Ludovic =?utf-8?q?Court=C3=A8s?= "'s message of "Sun, 06 Jun 2021 15:17:09 +0200") Message-ID: <87im2n7dsn.fsf@rohleder.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1623220091;1935337b; X-HE-SMSGID: 1lqrhB-0001po-EW X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hey Ludo! Thanks for the ping and sorry for the delay! I hope, this patch is better/pushable ;) >From 7e998af5b498388e5ffcf2491c6c934bf49b5c98 Mon Sep 17 00:00:00 2001 From: Michael Rohleder 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