From patchwork Thu Feb 22 16:10:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60899 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 0CF7A27BBEA; Thu, 22 Feb 2024 16:24:51 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 71BC727BBE2 for ; Thu, 22 Feb 2024 16:24:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBsI-0000oX-Pr; Thu, 22 Feb 2024 11:24:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rdBsG-0000nc-Sx for guix-patches@gnu.org; Thu, 22 Feb 2024 11:24:40 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rdBsG-0006hH-JU for guix-patches@gnu.org; Thu, 22 Feb 2024 11:24:40 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBsb-0003xl-VV for guix-patches@gnu.org; Thu, 22 Feb 2024 11:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 20/20] Revert "gnu: mpv: Propagate most libraries." Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861907015131 (code B ref 68813); Thu, 22 Feb 2024 16:25:01 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:24:30 +0000 Received: from localhost ([127.0.0.1]:39238 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBs5-0003vz-FV for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:24:29 -0500 Received: from mail-pl1-f174.google.com ([209.85.214.174]:59480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBs2-0003vY-N3 for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:24:27 -0500 Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1dc49afb495so8287195ad.2 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:24:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618978; x=1709223778; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jKv6IGT27RxVQp0/CDcpsaOb4Z2A3bPzBAUYjQUw4uE=; b=XHCa886LxCb/qHt5GpH0mx8eIk23kXGJZ89Dtb0ZJbGqM/khMJscDFYdc+EJf0j4Bi YWKkoxfORpuZs0JZGOR+lMcpa/aLwYbTmVnHZYtltIUio8tnNVgyndN8KVwKEKNTH8Mh zANmdvqGtkxG/JUoIM932vOWOCnS2WcYJyR2YeHCbAuSGl0eqoGhUa+FQ47seN6Utptm geCni6dnqywKzzLgS5We5Ciw/hM8QnoCfMzemqQRlA4vbKV/WNLojHiLlSfpfk34GlYk ZDHePr/pbNkfNWSOsRYQJ79yhAUcyyOCYdemVeKXg5w7tY/Q6WSiNYRQ1e5STK0rArPa 1Fbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618978; x=1709223778; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jKv6IGT27RxVQp0/CDcpsaOb4Z2A3bPzBAUYjQUw4uE=; b=IpmN3J/5NtACxrMoo8vJSqTWL6qxq9+MPudE+aW3+YDfe3NwN4AW2sqWUk2s5rXwfZ pk/M1qQI0lqjWlbLi7FzfrtLcwjHODaoPdS5ZYnHEv2qPtUEm+rTB7MdWBrEdJ7M7b6N fM77Tp5wO+UM0a1t/CLm9CrguJBZuhTWbVWcZtE+LogL3CWICQ+XF13LrgP5UDOR6VnQ I5P4LZXm3BbsTm0nUb5DF/c2Tut7t4PHivkLoS4pizf01bXUhAAmSLqBFq2dMt9EEYKO Ilr21lVJftGCG73lUhmMxBxvwgMtNwvyVLU341NmVwMeocZjkEvNLKgzTsKsFW2eU2mw O23w== X-Gm-Message-State: AOJu0YyrlornRcKbelhlUS7k2qLuais14z+HBFN2nd0+IwCKQOfqVfw0 Z3T2JmP6+qW1KLwB/N1wpLZH3xl7npr0dhILieZb5iOt4KaBfOvTcYXstorV X-Google-Smtp-Source: AGHT+IGaBSgRehI5GBGqYMwL4daB/XgI8iIu6w8UYOGli+XfsF4iRqiFNHlh0lo/wtRN9Djgd+Egmg== X-Received: by 2002:a05:6808:13c9:b0:3c1:54ac:ab80 with SMTP id d9-20020a05680813c900b003c154acab80mr15049792oiw.47.1708618504950; Thu, 22 Feb 2024 08:15:04 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.15.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:15:04 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:19 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This reverts commit f3fdb4e041cb5740ba0b38b9ad017571f8414d33. This is made possible by having replaced pkg-config with pkgconf, which more strictly interprets the private fields as purely for static compilation. Change-Id: I1c06623a4501bbcddfb80aa3cfd79a08409a08ae --- gnu/packages/video.scm | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c70646eccd..0746413ed8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2641,43 +2641,31 @@ (define-public mpv "-Ddvdnav=enabled" "-Dbuild-date=false"))) (native-inputs - (list perl ;for zsh completion file - pkg-config - python-docutils - python-wrapper)) + (list perl ; for zsh completion file + pkg-config python-docutils python-wrapper)) ;; Missing features: libguess, V4L2. (inputs - (list enca - ladspa - lcms - libbs2b - mpg123 - rsound - vulkan-headers - vulkan-loader - yt-dlp)) - ;; XXX: These are propagated for the mpv pkg-config package, as they are - ;; listed in Requires.private and would break 'pkg-config --exists mpv' if - ;; unavailable. - (propagated-inputs (list alsa-lib + enca ffmpeg jack-1 + ladspa + lcms libass libbluray libcaca + libbs2b libcdio-paranoia - libdrm - libdvdnav libdvdread + libdvdnav libjpeg-turbo libplacebo libva libvdpau libx11 libxext - libxinerama libxkbcommon + libxinerama libxpresent libxrandr libxscrnsaver @@ -2685,10 +2673,15 @@ (define-public mpv ;; XXX: lua > 5.2 is not currently supported; see meson.build lua-5.2 mesa + mpg123 pulseaudio + rsound shaderc + vulkan-headers + vulkan-loader wayland wayland-protocols + yt-dlp zimg zlib)) (home-page "https://mpv.io/")