[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#68250] [PATCH v2] gnu: mpv: Fix pkgconfig file.
From: |
Maxim Cournoyer |
Subject: |
[bug#68250] [PATCH v2] gnu: mpv: Fix pkgconfig file. |
Date: |
Thu, 18 Jan 2024 21:05:41 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) |
Hi,
Hilton Chain <hako@ultrarare.space> writes:
> 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"
I've just seen this, after pushing a hot fix as
f3fdb4e041cb5740ba0b38b9ad017571f8414d33, which propagates all listed
libraries in Requires.private.
I suppose that someone wanting to build something statically from mpv
would benefit from having the original mpv.pc file without
modifications.
Perhaps we can try it out for a bit, and if the propagation causes
problems, we can fall-back to this change here?
--
Thanks,
Maxim