From: Hilton Chain via Guix-patches via <guix-patches@gnu.org>
To: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Cc: 宋文武 <iyzsong@member.fsf.org>,
68250@debbugs.gnu.org, "Munyoki Kilyungi" <me@bonfacemunyoki.com>,
"Zheng Junjie" <zhengjunjie@iscas.ac.cn>,
"Lars-Dominik Braun" <lars@6xq.net>,
"Josselin Poiret" <dev@jpoiret.xyz>,
"Andrew Tropin" <andrew@trop.in>, jgart <jgart@dismail.de>,
"Marius Bakke" <marius@gnu.org>
Subject: [bug#68250] [PATCH v2] gnu: mpv: Fix pkgconfig file.
Date: Thu, 01 Feb 2024 13:01:59 +0800 [thread overview]
Message-ID: <87o7d04w1k.wl-hako@ultrarare.space> (raw)
In-Reply-To: <8734uukrgq.fsf_-_@gmail.com>
Hi Maxim,
On Fri, 19 Jan 2024 10:05:41 +0800,
Maxim Cournoyer wrote:
>
> 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?
Then we should follow the approach in v1 to add libmpv as a separate package.
I'll send v3 later.
Thanks
next prev parent reply other threads:[~2024-02-01 5:03 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 ` [bug#68250] [PATCH v2] gnu: mpv: Fix pkgconfig file Hilton Chain via Guix-patches via
2024-01-10 18:24 ` 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 [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o7d04w1k.wl-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=maxim.cournoyer@gmail.com \
--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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.