unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Hilton Chain via Guix-patches via <guix-patches@gnu.org>
To: 68250@debbugs.gnu.org
Cc: "Hilton Chain" <hako@ultrarare.space>,
	宋文武 <iyzsong@member.fsf.org>,
	"Hilton Chain" <hako@ultrarare.space>,
	宋文武 <iyzsong@member.fsf.org>, "Lars-Dominik Braun" <lars@6xq.net>,
	"Marius Bakke" <marius@gnu.org>,
	"Munyoki Kilyungi" <me@bonfacemunyoki.com>,
	jgart <jgart@dismail.de>, "Andrew Tropin" <andrew@trop.in>,
	"Josselin Poiret" <dev@jpoiret.xyz>,
	"Zheng Junjie" <zhengjunjie@iscas.ac.cn>
Subject: [bug#68250] [PATCH v2] gnu: mpv: Fix pkgconfig file.
Date: Sat,  6 Jan 2024 12:23:49 +0800	[thread overview]
Message-ID: <14315fb383a6560c67bdc6bf3f7cab8b8e36e0bb.1704514279.git.hako@ultrarare.space> (raw)
In-Reply-To: <521d0ba6e3d10b3b8aa98b35862d819c82223412.1704430613.git.hako@ultrarare.space>

This is a follow-up to ce7b2b57aa6da0ceace94ea5fb42392c7ff97d53.

* gnu/packages/video.scm (mpv)[arguments]<#:phases>: Add 'fix-mpv.pc.

Suggested-by: 宋文武 <iyzsong@member.fsf.org>
Change-Id: I9826d5d6c957ca3022fa326aee111edb533f05bc
---
 gnu/packages/video.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index e70aa5352e..10d46db38b 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2365,7 +2365,13 @@ (define-public mpv
               ;; and passed as linker flags, but the order in which they are added
               ;; varies.  See <https://github.com/mpv-player/mpv/issues/7855>.
               ;; Set PYTHONHASHSEED as a workaround for deterministic results.
-              (setenv "PYTHONHASHSEED" "1"))))
+              (setenv "PYTHONHASHSEED" "1")))
+          ;; mpv.pc is generated by meson.  libmpv's headers don't actually
+          ;; require these dependencies so it's safe to remove these two fields.
+          (add-after 'install 'fix-mpv.pc
+            (lambda _
+              (substitute* (string-append #$output "/lib/pkgconfig/mpv.pc")
+                (("^(Requires|Libs)\\.private:.*") "")))))
       #:configure-flags
       #~(list "-Dlibmpv=true"
               "-Dcdda=enabled"

base-commit: c0e21e523d93081153a2ffc91e5a9f06afe62b91
--
2.41.0




  reply	other threads:[~2024-01-06  4:30 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-05  5:06 [bug#68250] [PATCH] gnu: Add libmpv Hilton Chain via Guix-patches via
2024-01-06  4:23 ` Hilton Chain via Guix-patches via [this message]
2024-01-10 18:24   ` [bug#68250] [PATCH v2] gnu: mpv: Fix pkgconfig file Josselin Poiret via Guix-patches via
2024-01-13  6:48     ` Hilton Chain via Guix-patches via
2024-01-19  2:05   ` Maxim Cournoyer
2024-02-01  5:01     ` Hilton Chain via Guix-patches via
2024-02-05 19:37       ` Maxim Cournoyer
2024-02-26 16:01         ` Maxim Cournoyer
2024-02-27  1:31           ` Hilton Chain via Guix-patches via

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=14315fb383a6560c67bdc6bf3f7cab8b8e36e0bb.1704514279.git.hako@ultrarare.space \
    --to=guix-patches@gnu.org \
    --cc=68250@debbugs.gnu.org \
    --cc=andrew@trop.in \
    --cc=dev@jpoiret.xyz \
    --cc=hako@ultrarare.space \
    --cc=iyzsong@member.fsf.org \
    --cc=jgart@dismail.de \
    --cc=lars@6xq.net \
    --cc=marius@gnu.org \
    --cc=me@bonfacemunyoki.com \
    --cc=zhengjunjie@iscas.ac.cn \
    /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).