122100 2006-02-08 03:07 0000 media-video/vdr-1.3.1 failing to patch 2006-02-08 12:06:45 0000 1 1 1 Unclassified Gentoo Linux Ebuilds unspecified x86 Linux RESOLVED FIXED P2 normal --- 1 jiri@kulhan.cz media-tv@gentoo.org jiri@kulhan.cz 2006-02-08 03:07:30 0000 doma ~ # ebuild /usr/portage/media-video/vdr/vdr-1.3.41.ebuild unpack >>> md5 files ;-) vdr-1.3.27.ebuild >>> md5 files ;-) vdr-1.2.6-r1.ebuild >>> md5 files ;-) vdr-1.3.34-r1.ebuild >>> md5 files ;-) vdr-1.3.34-r2.ebuild >>> md5 files ;-) vdr-1.3.34.ebuild >>> md5 files ;-) vdr-1.3.36.ebuild >>> md5 files ;-) vdr-1.3.36-r1.ebuild >>> md5 files ;-) vdr-1.3.36-r2.ebuild >>> md5 files ;-) vdr-1.3.36-r3.ebuild >>> md5 files ;-) vdr-1.3.41.ebuild >>> md5 files ;-) files/digest-vdr-1.3.27 >>> md5 files ;-) files/vdr-1.2.6-gentoo.diff >>> md5 files ;-) files/vdr-1.3.32-daemon.patch >>> md5 files ;-) files/digest-vdr-1.2.6-r1 >>> md5 files ;-) files/digest-vdr-1.3.34 >>> md5 files ;-) files/vdr-1.2.6_CAN-2005-0071.patch >>> md5 files ;-) files/digest-vdr-1.3.34-r1 >>> md5 files ;-) files/digest-vdr-1.3.34-r2 >>> md5 files ;-) files/vdr-1.3.36-SourceCaps.patch >>> md5 files ;-) files/digest-vdr-1.3.36 >>> md5 files ;-) files/vdr-1.3.36-SourceCaps-for-lnb-sharing.patch >>> md5 files ;-) files/digest-vdr-1.3.36-r1 >>> md5 files ;-) files/vdr-1.3.36-low-space-crash.diff >>> md5 files ;-) files/digest-vdr-1.3.36-r2 >>> md5 files ;-) files/vdr-add-svdrp-down-0.1.diff >>> md5 files ;-) files/digest-vdr-1.3.36-r3 >>> md5 files ;-) files/digest-vdr-1.3.41 >>> md5 files ;-) files/vdr-setup-menu-0.2.3.xml >>> md5 files ;-) files/1.3.27/vdr-1.3.27-SourceCaps-lnb-sharing.diff >>> md5 files ;-) files/1.3.27/vdr-1.3.27-SourceCaps.diff >>> md5 files ;-) files/1.3.34/SourceCaps-1.3.33-lnb-sharing.patch >>> md5 files ;-) files/1.3.34/SourceCaps-1.3.33.patch >>> md5 files ;-) files/1.3.34/vdr-1.3.34-shutdown-retry.diff >>> md5 src_uri ;-) vdr-1.3.41.tar.bz2 >>> md5 src_uri ;-) vdr-1.3.41-gentoo-patchset-0.3.tar.bz2 >>> Checking vdr-1.3.41.tar.bz2's mtime... >>> Checking vdr-1.3.41-gentoo-patchset-0.3.tar.bz2's mtime... >>> Not marked as unpacked; recreating WORKDIR... >>> Unpacking source... >>> Unpacking vdr-1.3.41.tar.bz2 to /var/tmp/portage/vdr-1.3.41/work >>> Unpacking vdr-1.3.41-gentoo-patchset-0.3.tar.bz2 to /var/tmp/portage/vdr-1.3.41/work * Changing pathes for gentoo ... [ ok ] * Applying 001-vdr-1.3.41-editinsert.diff ... [ ok ] * Applying 002-vdr-1.3.41-remux2.diff ... [ ok ] * Applying 003-vdr-1.3.41-up-down-primary-limit.diff ... [ ok ] * Applying 004-vdr-1.3.41-add-svdrp-down-0.1.diff ... [ ok ] * Applying 005-vdr-1.3.41-prepare-collisions.diff ... [ ok ] * Applying 008-vdr-1.3.41-bigpatch-current.diff ... [ ok ] * Applying 011-vdr-1.3.41-plugin-setup-0.2.3-for-bigpatch.diff ... [ ok ] * Applying 013-vdr-1.3.41-SetGroupSep.diff ... * Failed Patch: 013-vdr-1.3.41-SetGroupSep.diff ! * ( /var/tmp/portage/vdr-1.3.41/work/vdr-1.3.41-gentoo-patchset-0.3/013-vdr-1.3.41-SetGroupSep.diff ) * * Include in your bugreport the contents of: * * /var/tmp/portage/vdr-1.3.41/temp/013-vdr-1.3.41-SetGroupSep.diff-19654.out !!! ERROR: media-video/vdr-1.3.41 failed. !!! Function epatch, Line 350, Exitcode 0 !!! Failed Patch: 013-vdr-1.3.41-SetGroupSep.diff! !!! If you need support, post the topmost build error, NOT this status message. doma ~ # cat /var/tmp/portage/vdr-1.3.41/temp/013-vdr-1.3.41-SetGroupSep.diff-19654.out ***** 013-vdr-1.3.41-SetGroupSep.diff ***** =========================================== PATCH COMMAND: patch -p0 -g0 --no-backup-if-mismatch < /var/tmp/portage/vdr-1.3.41/work/vdr-1.3.41-gentoo-patchset-0.3/013-vdr-1.3.41-SetGroupSep.diff =========================================== can't find file to patch at input line 12 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Extracted from http://www.rst38.org.uk/vdr/decruft/vdr-decruft-0.0.4.tgz | |Apply without any use-flags as this change does not harm anything else. | | |SOURCEFILE: 080-plugins/vdr-1.3.20-SetGroupSep.diff | |Modified by vdr-patch-manager-0.1 by Matthias Schwarzott <zzam@gentoo.org> | |--- vdr-1.3.41-before/channels.h |+++ vdr-1.3.41-dest-normalized/channels.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored =========================================== PATCH COMMAND: patch -p1 -g0 --no-backup-if-mismatch < /var/tmp/portage/vdr-1.3.41/work/vdr-1.3.41-gentoo-patchset-0.3/013-vdr-1.3.41-SetGroupSep.diff =========================================== patching file channels.h Hunk #1 FAILED at 215. 1 out of 1 hunk FAILED -- saving rejects to file channels.h.rej =========================================== PATCH COMMAND: patch -p2 -g0 --no-backup-if-mismatch < /var/tmp/portage/vdr-1.3.41/work/vdr-1.3.41-gentoo-patchset-0.3/013-vdr-1.3.41-SetGroupSep.diff =========================================== missing header for unified diff at line 12 of patch can't find file to patch at input line 12 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Extracted from http://www.rst38.org.uk/vdr/decruft/vdr-decruft-0.0.4.tgz | |Apply without any use-flags as this change does not harm anything else. | | |SOURCEFILE: 080-plugins/vdr-1.3.20-SetGroupSep.diff | |Modified by vdr-patch-manager-0.1 by Matthias Schwarzott <zzam@gentoo.org> | |--- vdr-1.3.41-before/channels.h |+++ vdr-1.3.41-dest-normalized/channels.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored =========================================== PATCH COMMAND: patch -p3 -g0 --no-backup-if-mismatch < /var/tmp/portage/vdr-1.3.41/work/vdr-1.3.41-gentoo-patchset-0.3/013-vdr-1.3.41-SetGroupSep.diff =========================================== missing header for unified diff at line 12 of patch can't find file to patch at input line 12 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Extracted from http://www.rst38.org.uk/vdr/decruft/vdr-decruft-0.0.4.tgz | |Apply without any use-flags as this change does not harm anything else. | | |SOURCEFILE: 080-plugins/vdr-1.3.20-SetGroupSep.diff | |Modified by vdr-patch-manager-0.1 by Matthias Schwarzott <zzam@gentoo.org> | |--- vdr-1.3.41-before/channels.h |+++ vdr-1.3.41-dest-normalized/channels.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored =========================================== PATCH COMMAND: patch -p4 -g0 --no-backup-if-mismatch < /var/tmp/portage/vdr-1.3.41/work/vdr-1.3.41-gentoo-patchset-0.3/013-vdr-1.3.41-SetGroupSep.diff =========================================== missing header for unified diff at line 12 of patch can't find file to patch at input line 12 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Extracted from http://www.rst38.org.uk/vdr/decruft/vdr-decruft-0.0.4.tgz | |Apply without any use-flags as this change does not harm anything else. | | |SOURCEFILE: 080-plugins/vdr-1.3.20-SetGroupSep.diff | |Modified by vdr-patch-manager-0.1 by Matthias Schwarzott <zzam@gentoo.org> | |--- vdr-1.3.41-before/channels.h |+++ vdr-1.3.41-dest-normalized/channels.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored doma ~ # ===================================================================== It seems that this patch is already included in the vdr sources: doma work # cat vdr-1.3.41-gentoo-patchset-0.3/013-vdr-1.3.41-SetGroupSep.diff Extracted from http://www.rst38.org.uk/vdr/decruft/vdr-decruft-0.0.4.tgz Apply without any use-flags as this change does not harm anything else. SOURCEFILE: 080-plugins/vdr-1.3.20-SetGroupSep.diff Modified by vdr-patch-manager-0.1 by Matthias Schwarzott <zzam@gentoo.org> --- vdr-1.3.41-before/channels.h +++ vdr-1.3.41-dest-normalized/channels.h @@ -215,6 +215,7 @@ void SetCaDescriptors(int Level); void SetLinkChannels(cLinkChannels *LinkChannels); void SetRefChannel(cChannel *RefChannel); + void SetGroupSep(bool issep) { groupSep = issep; } }; class cChannels : public cRwLock, public cConfig<cChannel> { doma work # grep -C 5 SetGroupSep vdr-1.3.41/channels.h void SetPids(int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int Tpid); void SetCaIds(const int *CaIds); // list must be zero-terminated void SetCaDescriptors(int Level); void SetLinkChannels(cLinkChannels *LinkChannels); void SetRefChannel(cChannel *RefChannel); void SetGroupSep(bool issep) { groupSep = issep; } }; class cChannels : public cRwLock, public cConfig<cChannel> { private: int maxNumber; zzam@gentoo.org 2006-02-08 12:06:45 0000 The failing patch was not included in vanilla vdr sources but in bigpatch. Nevertheless this should be fixed now. The patch is only applied when bigpatch is not used. PS: You can visit us in #gentoo-vdr on freenode. PPS: Next time please add to the vdr-ebuild-version number also the used use-flags.