contrib: fix cddb mistakenly depending on iconv

Currently there are two issues here, one hiding the other:

• The sed pattern is wrong, causing it to not match due to leading spaces.
• The replacement for the second sed pattern is wrong, not removing the @LIBICONV@, causing it to be present in the generated .pc, but due to the previous issue, this was hidden as the iconv detection was never actually removed.

This issue only rarely manifested, as we also build iconv in contribs, so it was totally depending on build order if this caused any issue or not.

assigned to @ePirat

added Component::Build system: Contribs label

added MRStatus::Reviewable label

approved this merge request

added MRStatus::Acceptable label and removed MRStatus::Reviewable label

approved this merge request

Indeed the copy/paste from lame was bogus.

approved this merge request

added MRStatus::Accepted label and removed MRStatus::Acceptable label

MR Acceptance result

This MergeRequest has been Accepted! Congratulations.

MR acceptance checks details:

• MR should be considered mergeable by Gitlab
• Last pipeline should be successful
• MergeRequest should have at least one external review and/or vote
• All threads should be resolved, and score >= 0
• MergeRequest should have no activity (threads/votes) for (24h/24h)

This message was automatically generated by homer-bot.

added 8 commits

• fa218a92...062929a6 - 7 commits from branch videolan:master
• 9cff68f0 - contrib: fix cddb mistakenly depending on iconv

Compare with previous version

enabled an automatic merge when all merge checks for 9cff68f0 pass

merged