[vlc-devel] [PATCH 1/10] po: fix unwanted regeneration

[Lyndon Brown]

On Tue, 2020-10-06 at 14:18 +0200, Steve Lhomme wrote:
> On 2020-09-30 21:13, Lyndon Brown wrote:
> > From: Lyndon Brown <jnqnfe at gmail.com>
> > Date: Sat, 29 Aug 2020 11:29:03 +0100
> > Subject: po: fix unwanted regeneration
> > 
> > commit e1a90aa943b55734cdf8f25f5e2dc12a547b0c30 removed an
> > entry from po/vlc.pot which consequently causes builds to
> > update all of the po files accordingly, which then require
> > merging, which has not been done.
> > 
> > this reverts that portion of the change, to avoid this
> > problem. the pot file can be properly updated later.
> 
> The crystalhd.c doesn't exist in the source code anymore. The proper
> fix 
> would be to remove the corresponding lines from the .po files.

Yes, but the problem only exists because the referenced commit modified
the pot file without also updating the po files, rather than waiting
for a proper update to be performed on the pot/po files later.
Reverting the pot file change is a quick and simple solution to the
problem it causes. Spending time manually going through all of the po
files to purge artefacts takes a lot more time, time I hoped to not
have to spend on this, and more time for the reviewer to review the
patch.

(A patch just containing the resulting changes generated by the problem
in many cases involves moving and commenting out entries so it requires
further work to manually purge things, since I would not expect that
patch alone to be accepted).

But fine, I've done the extra manual work. The attached patch purges
all crystal hd artefacts from the po files as an alternative.

> > diff --git a/po/vlc.pot b/po/vlc.pot
> > index 1bb9ed8c0f..68b755cc01 100644
> > --- a/po/vlc.pot
> > +++ b/po/vlc.pot
> > @@ -10502,6 +10502,10 @@ msgstr ""
> >   msgid "CDG video decoder"
> >   msgstr ""
> >   
> > +#: modules/codec/crystalhd.c:90
> > +msgid "Crystal HD hardware video decoder"
> > +msgstr ""
> > +
> >   #: modules/codec/cvdsub.c:50
> >   msgid "CVD subtitle decoder"
> >   msgstr ""
> > 
> > _______________________________________________
> > vlc-devel mailing list
> > To unsubscribe or modify your subscription options:
> > https://mailman.videolan.org/listinfo/vlc-devel
> > 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: purge_chd.patch
Type: text/x-patch
Size: 47467 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20201006/fd391852/attachment.bin>