mythtv-v4l2-fix.2.patch won't apply using ebuilds in https://github.com/MythTV/packaging/tree/master/Gentoo

[lee@…]

After updating from ​https://github.com/MythTV/packaging/tree/master/Gentoo this morning, the ebuild for mythtv fails attempting to apply the mythtv-v4l2-fix.2.patch patch mentioned within the mythtv 0.24 ebuild:

 * Messages for package media-tv/mythtv-0.24_p20110625:

 *
 * For NVIDIA based cards, the XvMC renderer only works on
 * the NVIDIA 4, 5, 6 & 7 series cards.
 * Failed Patch: mythtv-v4l2-fix.2.patch !
 *  ( /usr/local/portage/mythtv/Gentoo/media-tv/mythtv/files/mythtv-v4l2-fix.2.patch )
 *
 * Include in your bugreport the contents of:
 *
 *   /var/tmp/portage/media-tv/mythtv-0.24_p20110625/temp/mythtv-v4l2-fix.2.patch.out
 * ERROR: media-tv/mythtv-0.24_p20110625 failed (prepare phase):
 *   Failed Patch: mythtv-v4l2-fix.2.patch!
 *
 * Call stack:
 *     ebuild.sh, line   56:  Called src_prepare
 *   environment, line 6149:  Called epatch '/usr/local/portage/mythtv/Gentoo/media-tv/mythtv/files/mythtv-v4l2-fix.2.patch'
 *   environment, line 2220:  Called die
 * The specific snippet of code:
 *               die "Failed Patch: ${patchname}!";
 *
 * If you need support, post the output of 'emerge --info =media-tv/mythtv-0.24_p20110625',
 * the complete build log and the output of 'emerge -pqv =media-tv/mythtv-0.24_p20110625'.
 * This ebuild used the following eclasses from overlays:
 *   /usr/local/portage/mythtv/Gentoo/eclass/mythtv.eclass
 * This ebuild is from an overlay named 'Mythtv-Ebuilds': '/usr/local/portage/mythtv/Gentoo/'
 * The complete build log is located at '/var/tmp/portage/media-tv/mythtv-0.24_p20110625/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/media-tv/mythtv-0.24_p20110625/temp/environment'.
 * S: '/var/tmp/portage/media-tv/mythtv-0.24_p20110625/work/MythTV-mythtv-30993d6/mythtv'

Looking closer at the patch out:

***** mythtv-v4l2-fix.2.patch *****

===================================

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch < '/usr/local/portage/mythtv/Gentoo/media-tv/mythtv/files/mythtv-v4l2-fix.2.patch'

===================================
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/mythtv/configure b/mythtv/configure
|index 1efe803..7bcdf06 100755
|--- a/mythtv/configure
|+++ b/mythtv/configure
--------------------------
No file to patch.  Skipping patch.
8 out of 8 hunks ignored
can't find file to patch at input line 78
Perhaps you used the wrong -p or --strip option?

When I look at other patchs I notice that there is no a/<path> b/<path> in the header, they are all rooted in the unpacked mythtv source itself.

I assume that the ebuild needs to know that the patch execution options are slightly different (-p1 instead of -p0 perhaps?)

[lee@…]

Apologies, on closer inspection the patch fails to apply cleanly:

PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch < '/usr/local/portage/mythtv/Gentoo/media-tv/mythtv/files/mythtv-v4l2-fix.2.patch'

===================================
patching file configure
Hunk #4 FAILED at 1717.
Hunk #8 succeeded at 4380 (offset -1 lines).
1 out of 8 hunks FAILED -- saving rejects to file configure.rej
patching file libs/libmythtv/NuppelVideoRecorder.cpp
Hunk #1 FAILED at 42.
1 out of 7 hunks FAILED -- saving rejects to file libs/libmythtv/NuppelVideoRecorder.cpp.rej
patching file libs/libmythtv/analogsignalmonitor.cpp
Hunk #1 FAILED at 6.
1 out of 3 hunks FAILED -- saving rejects to file libs/libmythtv/analogsignalmonitor.cpp.rej
patching file libs/libmythtv/cardutil.cpp
Hunk #2 FAILED at 28.
1 out of 8 hunks FAILED -- saving rejects to file libs/libmythtv/cardutil.cpp.rej
patching file libs/libmythtv/channelscan/channelscan_sm.cpp
patching file libs/libmythtv/channelscan/channelscanner.cpp
patching file libs/libmythtv/channelscan/scanwizardconfig.cpp
patching file libs/libmythtv/libmythtv.pro
patching file libs/libmythtv/signalmonitor.cpp
patching file libs/libmythtv/tv_rec.cpp
patching file libs/libmythtv/v4lchannel.cpp
Hunk #1 FAILED at 16.
1 out of 18 hunks FAILED -- saving rejects to file libs/libmythtv/v4lchannel.cpp.rej
patching file libs/libmythtv/v4lchannel.h
patching file libs/libmythtv/vbitext/vbi.c
Hunk #1 FAILED at 14.
1 out of 2 hunks FAILED -- saving rejects to file libs/libmythtv/vbitext/vbi.c.rej
patching file libs/libmythtv/videosource.cpp
Hunk #2 succeeded at 2010 (offset -2 lines).
Hunk #3 succeeded at 2018 (offset -2 lines).
Hunk #4 succeeded at 2199 (offset -2 lines).
Hunk #5 succeeded at 2212 (offset -2 lines).
Hunk #6 succeeded at 2224 (offset -2 lines).
===================================

rejects to be attached

[mathieu.okuyama@…]

same problem here...

[robertm]

That's because the patch is unneeded.

And please read the ticket howto, "me too" is unhelpful, and the reason this ticket is now locked.

[Raymond Wagner]

Conflicting patched removed over two weeks ago in ​fb2abfb4116