Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 89229 - k3b-0.11.23-r2 failed patch: k3b-dvdrip-transcode.patch
Summary: k3b-0.11.23-r2 failed patch: k3b-dvdrip-transcode.patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: x86 Linux
: High normal (vote)
Assignee: Carsten Lohrke (RETIRED)
URL:
Whiteboard:
Keywords:
: 89240 89526 89570 89635 89726 (view as bug list)
Depends on:
Blocks:
 
Reported: 2005-04-15 14:54 UTC by Gregg Casillo
Modified: 2006-09-21 16:34 UTC (History)
22 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
k3b-dvdrip-transcode.patch (k3b-dvdrip-transcode.patch,1.95 KB, patch)
2005-04-16 04:30 UTC, Martin Ehmsen (RETIRED)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Gregg Casillo 2005-04-15 14:54:53 UTC
Updating my system today when k3b-0.11.23-r2 failed to emerge; I have 0.11.23 installed:

>>> emerge (5 of 8) app-cdr/k3b-0.11.23-r2 to /
>>> md5 src_uri ;-) k3b-0.11.23.tar.bz2
>>> Unpacking source...
>>> Unpacking k3b-0.11.23.tar.bz2 to /var/tmp/portage/k3b-0.11.23-r2/work
 * Applying k3b-0.11.17-noarts.patch ...                                  [ ok ]
 * Applying k3b-dvdrip-transcode.patch ...

 * Failed Patch: k3b-dvdrip-transcode.patch !
 *  ( /usr/portage/app-cdr/k3b/files/k3b-dvdrip-transcode.patch )
 *
 * Include in your bugreport the contents of:
 *
 *   /var/tmp/portage/k3b-0.11.23-r2/temp/k3b-dvdrip-transcode.patch-2549.out

-------

The output of that was:

poe movies # cat /var/tmp/portage/k3b-0.11.23-r2/temp/k3b-dvdrip-transcode.patch-2549.out
***** k3b-dvdrip-transcode.patch *****

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

PATCH COMMAND:  patch -p0 -g0 < /usr/portage/app-cdr/k3b/files/k3b-dvdrip-transcode.patch

======================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Narup k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.23-new/src/rip/k3bdvdrippingprocess.cpp
|--- k3b-0.11.23.orig/src/rip/k3bdvdrippingprocess.cpp  2004-06-02 21:31:41.000000000 +1200
|+++ k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp       2005-04-15 11:21:13.000000000 +1200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
======================================

PATCH COMMAND:  patch -p1 -g0 < /usr/portage/app-cdr/k3b/files/k3b-dvdrip-transcode.patch

======================================
patching file src/rip/k3bdvdrippingprocess.cpp
Hunk #2 FAILED at 127.
1 out of 2 hunks FAILED -- saving rejects to file src/rip/k3bdvdrippingprocess.cpp.rej
======================================

PATCH COMMAND:  patch -p2 -g0 < /usr/portage/app-cdr/k3b/files/k3b-dvdrip-transcode.patch

======================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Narup k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.23-new/src/rip/k3bdvdrippingprocess.cpp
|--- k3b-0.11.23.orig/src/rip/k3bdvdrippingprocess.cpp  2004-06-02 21:31:41.000000000 +1200
|+++ k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp       2005-04-15 11:21:13.000000000 +1200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
======================================

PATCH COMMAND:  patch -p3 -g0 < /usr/portage/app-cdr/k3b/files/k3b-dvdrip-transcode.patch

======================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Narup k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.23-new/src/rip/k3bdvdrippingprocess.cpp
|--- k3b-0.11.23.orig/src/rip/k3bdvdrippingprocess.cpp  2004-06-02 21:31:41.000000000 +1200
|+++ k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp       2005-04-15 11:21:13.000000000 +1200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
======================================

PATCH COMMAND:  patch -p4 -g0 < /usr/portage/app-cdr/k3b/files/k3b-dvdrip-transcode.patch

======================================
missing header for unified diff at line 4 of patch
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Narup k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.23-new/src/rip/k3bdvdrippingprocess.cpp
|--- k3b-0.11.23.orig/src/rip/k3bdvdrippingprocess.cpp  2004-06-02 21:31:41.000000000 +1200
|+++ k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp       2005-04-15 11:21:13.000000000 +1200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored


Not sure what to make of this. I do have dvdrip-0.52.3 and transcode-0.6.14-r1 installed on this machine. Here's my emerge info for reference:

Portage 2.0.51.19 (default-linux/x86/2005.0, gcc-3.4.3-20050110, glibc-2.3.4.20050125-r1, 2.6.11-gentoo-r5 i686)
=================================================================
System uname: 2.6.11-gentoo-r5 i686 Intel(R) Pentium(R) 4 CPU 3.00GHz
Gentoo Base System version 1.6.10
Python:              dev-lang/python-2.3.5 [2.3.5 (#1, Mar 12 2005, 23:07:56)]
distcc 2.18.3 i686-pc-linux-gnu (protocols 1 and 2) (default port 3632) [enabled]
ccache version 2.4 [enabled]
dev-lang/python:     2.3.5
sys-devel/autoconf:  2.13, 2.59-r6
sys-devel/automake:  1.9.5, 1.5, 1.6.3, 1.7.9-r1, 1.4_p6, 1.8.5-r3
sys-devel/binutils:  2.15.92.0.2-r8
sys-devel/libtool:   1.5.14
virtual/os-headers:  2.6.11
ACCEPT_KEYWORDS="x86 ~x86"
AUTOCLEAN="yes"
CFLAGS="-march=pentium4 -O3 -pipe -fomit-frame-pointer"
CHOST="i686-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3.4/env /usr/kde/3.4/share/config /usr/kde/3.4/shutdown /usr/kde/3/share/config /usr/lib/X11/xkb /usr/share/config /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"
CXXFLAGS="-march=pentium4 -O3 -pipe -fomit-frame-pointer"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs autoconfig ccache distcc distlocks sandbox sfperms"
GENTOO_MIRRORS="ftp://gentoo.mirrors.tds.net/gentoo"
MAKEOPTS="-j5"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="x86 X a52 aac acpi alsa arts audiofile avi bash-completion berkdb bitmap-fonts bzlib cdr crypt cups curl divx4linux dts dv dvb dvd dvdr dvdread encode esd fam ffmpeg flac foomaticdb freetype gdbm gif imagemagick imap imlib innodb java jikes jpeg junit kde kdeenablefinal kdexdeltas libg++ libwww live mad maildir matroska mime mjpeg mmx mmxext mng mp3 mpeg mplayer mysql mythtv nas ncurses network nls nptl nptlonly nvidia ogg oggvorbis openal opengl oss pdflib perl png python qt quicktime rar readline real rtc samba sdl sndfile sockets speex sse sse2 ssl svg tcpd theora threads tidy tiff truetype truetype-fonts type1-fonts usb v4l2 vhosts vorbis xine xinerama xml2 xpm xv xvid zlib"
Unset:  ASFLAGS, CBUILD, CTARGET, LANG, LC_ALL, LDFLAGS, LINGUAS


Thanks!

Reproducible: Always
Steps to Reproduce:
1. emerge world -u
2. attempt to update k3b from 0.11.23 to 0.11.23-r2
3. patch fails and update brakes
Comment 1 Carsten Lohrke (RETIRED) gentoo-dev 2005-04-15 16:44:38 UTC
Thanks, fix in cvs.
Comment 2 Jakub Moc (RETIRED) gentoo-dev 2005-04-16 03:18:30 UTC
*** Bug 89240 has been marked as a duplicate of this bug. ***
Comment 3 Jakub Moc (RETIRED) gentoo-dev 2005-04-16 03:19:46 UTC
Carsten, users still complain. :-)
Comment 4 Martin Ehmsen (RETIRED) gentoo-dev 2005-04-16 03:29:55 UTC
Carsten, whatever caused you to resolve this bug in the first place, it didn't work for me, the patch still fails.
Do you need more info?
Comment 5 Jakub Moc (RETIRED) gentoo-dev 2005-04-16 03:43:15 UTC
Martin, please include the content of the failed patch output like the error message instructed you. Thanks. 
Comment 6 Jurek Bartuszek (RETIRED) gentoo-dev 2005-04-16 03:46:59 UTC
I've got the same problem here:

emerge -v k3b

[...]
>>> Unpacking k3b-0.11.23.tar.bz2 to /var/tmp/portage/k3b-0.11.23-r2/work
>>> Unpacking k3b-i18n-0.11.tar.bz2 to /var/tmp/portage/k3b-0.11.23-r2/work
 * Applying k3b-0.11.17-noarts.patch ...                                  [ ok ]
 * Applying k3b-dvdrip-transcode.patch ...

 * Failed Patch: k3b-dvdrip-transcode.patch !
 *  ( /usr/portage/app-cdr/k3b/files/k3b-dvdrip-transcode.patch )
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/k3b-0.11.23-r2/temp/k3b-dvdrip-transcode.patch-25516.out

That's it.
Comment 7 Martin Ehmsen (RETIRED) gentoo-dev 2005-04-16 03:50:05 UTC
The important part must be the following:

***** k3b-dvdrip-transcode.patch *****
PATCH COMMAND:  patch -p1 -g0 < /usr/portage/app-cdr/k3b/files/k3b-dvdrip-transcode.patch

======================================
patching file src/rip/k3bdvdrippingprocess.cpp
Hunk #2 FAILED at 127.
1 out of 2 hunks FAILED -- saving rejects to file src/rip/k3bdvdrippingprocess.cpp.rej
======================================

But I can't seem to locate the k3bdvdrippingprocess.cpp.rej file?!?
Comment 8 Martin Ehmsen (RETIRED) gentoo-dev 2005-04-16 03:54:20 UTC
Okay... I tried to patch my self and the .rej file looks like (not very exciting):

***************
*** 119,131 ****
      connect( m_audioProcess, SIGNAL( finished() ), this, SLOT( slotAudioProcessFinished() ) );
      m_delAudioProcess = true;
      */
      const K3bExternalBin *m_tccatBin = k3bcore->externalBinManager()->binObject("tccat");
      if( m_tccatBin->version >= K3bVersion( 0, 6, 12 ) ) {
        emit infoMessage( i18n("Sorry, K3b does not support ripping Video DVDs with transcode >= 0.6.12 yet."),
                        ERROR );
        emit finished( false );
        return;
      }
  
      m_ripProcess = new KShellProcess();
      kdDebug() << "(K3bDvdRippingProcess)" << m_tccatBin->path << " -i " << m_device <<" "<< m_ripMode << endl;
--- 127,145 ----
      connect( m_audioProcess, SIGNAL( finished() ), this, SLOT( slotAudioProcessFinished() ) );
      m_delAudioProcess = true;
      */
+ 
      const K3bExternalBin *m_tccatBin = k3bcore->externalBinManager()->binObject("tccat");
+ 
+     /*
+      * This check probably not required any more
+      *
      if( m_tccatBin->version >= K3bVersion( 0, 6, 12 ) ) {
        emit infoMessage( i18n("Sorry, K3b does not support ripping Video DVDs with transcode >= 0.6.12 yet."),
                        ERROR );
        emit finished( false );
        return;
      }
+     */
  
      m_ripProcess = new KShellProcess();
      kdDebug() << "(K3bDvdRippingProcess)" << m_tccatBin->path << " -i " << m_device <<" "<< m_ripMode << endl;
Comment 9 Martin Ehmsen (RETIRED) gentoo-dev 2005-04-16 04:30:50 UTC
Created attachment 56436 [details, diff]
k3b-dvdrip-transcode.patch

I have fixed the patch.
It seems that in version 0.11.23 someone have changed the message about k3b not
ripping dvd's with transcode, so that it talks about transcode 0.1.12 instead
of 0.6.12 as it should (someone upstream must have changed this).
The patch is the same as before but now it applies cleanly.
Comment 10 Ivan Yosifov 2005-04-16 05:56:52 UTC
Used your patch, applies and compiles fine. Thanks.
Comment 11 Christoph Gysin 2005-04-16 08:05:09 UTC
I also confirm that the patch works. Please apply it to cvs.
Comment 12 Shyam Mani (RETIRED) gentoo-dev 2005-04-16 11:21:40 UTC
I got a failed too :

>>> emerge (25 of 33) app-cdr/k3b-0.11.23-r2 to /
>>> md5 files   ;-) k3b-0.11.23.ebuild
>>> md5 files   ;-) k3b-0.11.18.ebuild
>>> md5 files   ;-) ChangeLog
>>> md5 files   ;-) k3b-0.11.23-r2.ebuild
>>> md5 files   ;-) metadata.xml
>>> md5 files   ;-) files/k3b-0.11.18-configure-libsamplerate.patch
>>> md5 files   ;-) files/digest-k3b-0.11.23-r2
>>> md5 files   ;-) files/k3b-0.11.17-noarts.patch
>>> md5 files   ;-) files/digest-k3b-0.11.18
>>> md5 files   ;-) files/digest-k3b-0.11.23
>>> md5 files   ;-) files/k3b-dvdrip-transcode.patch
>>> md5 src_uri ;-) k3b-0.11.23.tar.bz2

* Please notice, that K3b does not support ripping Video DVDs with >=media-video/transcode-0.6.12.

>>> Unpacking source...
>>> Unpacking k3b-0.11.23.tar.bz2 to /var/tmp/portage/k3b-0.11.23-r2/work
* Applying k3b-0.11.17-noarts.patch ...                                  [ ok ]
* Applying k3b-dvdrip-transcode.patch ...

* Failed Patch: k3b-dvdrip-transcode.patch !
*  ( /usr/portage/app-cdr/k3b/files/k3b-dvdrip-transcode.patch )
*
* Include in your bugreport the contents of:
*
*   /var/tmp/portage/k3b-0.11.23-r2/temp/k3b-dvdrip-transcode.patch-3699.out

Contents of the file :
***** k3b-dvdrip-transcode.patch *****

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

PATCH COMMAND:  patch -p0 -g0 < /usr/portage/app-cdr/k3b/files/k3b-dvdrip-transcode.patch

======================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Narup k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.23-new/src/rip/k3bdvdrippingprocess.cpp
|--- k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp       2004-06-02 21:31:41.000000000 +1200
|+++ k3b-0.11.23.new/src/rip/k3bdvdrippingprocess.cpp   2005-04-15 11:21:13.000000000 +1200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
======================================

PATCH COMMAND:  patch -p1 -g0 < /usr/portage/app-cdr/k3b/files/k3b-dvdrip-transcode.patch

======================================
patching file src/rip/k3bdvdrippingprocess.cpp
Hunk #2 FAILED at 127.
1 out of 2 hunks FAILED -- saving rejects to file src/rip/k3bdvdrippingprocess.cpp.rej
======================================

PATCH COMMAND:  patch -p2 -g0 < /usr/portage/app-cdr/k3b/files/k3b-dvdrip-transcode.patch

======================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Narup k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.23-new/src/rip/k3bdvdrippingprocess.cpp
|--- k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp       2004-06-02 21:31:41.000000000 +1200
|+++ k3b-0.11.23.new/src/rip/k3bdvdrippingprocess.cpp   2005-04-15 11:21:13.000000000 +1200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
======================================

PATCH COMMAND:  patch -p3 -g0 < /usr/portage/app-cdr/k3b/files/k3b-dvdrip-transcode.patch

======================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Narup k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.23-new/src/rip/k3bdvdrippingprocess.cpp
|--- k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp       2004-06-02 21:31:41.000000000 +1200
|+++ k3b-0.11.23.new/src/rip/k3bdvdrippingprocess.cpp   2005-04-15 11:21:13.000000000 +1200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
======================================

PATCH COMMAND:  patch -p4 -g0 < /usr/portage/app-cdr/k3b/files/k3b-dvdrip-transcode.patch

======================================
missing header for unified diff at line 4 of patch
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Narup k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.23-new/src/rip/k3bdvdrippingprocess.cpp
|--- k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp       2004-06-02 21:31:41.000000000 +1200
|+++ k3b-0.11.23.new/src/rip/k3bdvdrippingprocess.cpp   2005-04-15 11:21:13.000000000 +1200
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
Comment 13 Elfyn McBratney (beu) (RETIRED) gentoo-dev 2005-04-16 23:31:26 UTC
Shyam, please attach such log files next time instead of pasting them inline.
Comment 14 Shyam Mani (RETIRED) gentoo-dev 2005-04-16 23:57:14 UTC
Will do. Sorry!
Comment 15 Jaak Ristioja 2005-04-17 00:48:03 UTC
Is this patch even neccesary when using USE="-encode"?
Comment 16 Stephan 2005-04-17 06:24:09 UTC
How to apply your strange patch?
Seems not to work for me.
Comment 17 Martin Ehmsen (RETIRED) gentoo-dev 2005-04-17 06:32:07 UTC
Why is the patch strange...?!?
You can apply it with the patch command (apply the correct -px depending on from where you are patching).
Alternatively copy the patch to the files-dir (overwriting the old patch) and do a "ebuild k3b-bla-bla.ebuild digest" and then try to emerge k3b as usual.
Comment 18 Paul Taylor 2005-04-17 06:52:37 UTC
Martin's patch applies for me using the copy and digest method.
Comment 19 Krzysztof Stasiorowski 2005-04-17 07:41:43 UTC
Got the same error, attached patch works
Comment 20 Stephan 2005-04-17 08:37:05 UTC
Ok thank you very much.
Now it works. Thanks really! :)

So what? Will this be fixed in CVS soon?

cheers.
Comment 21 Elfyn McBratney (beu) (RETIRED) gentoo-dev 2005-04-17 09:17:15 UTC
It'll be fixed once the maintainers get to it - shouldn't be long.

In the mean-time, (for people just finding this) if you run into the bug, copying the patch from comment #9, running 'ebuild /usr/portage/app-cdr/k3b/k3b-0.11.23-r2.ebuild digest' and re-emerging k3b should sort you out if you cannot wait. :)
Comment 22 Ernst de Haan 2005-04-18 03:17:42 UTC
Same problem here. I'll wait for the fix to be committed.
Comment 23 Carsten Lohrke (RETIRED) gentoo-dev 2005-04-18 04:29:34 UTC
Wrong patch, wrong tree used to test - but enjoyed the weekend. ;) This stupid mistake reveals it once again: I should go sleeping when I'm tired. Sorry everyone.
Comment 24 Gregorio Guidi (RETIRED) gentoo-dev 2005-04-18 07:42:02 UTC
*** Bug 89526 has been marked as a duplicate of this bug. ***
Comment 25 Carsten Lohrke (RETIRED) gentoo-dev 2005-04-18 15:27:52 UTC
*** Bug 89570 has been marked as a duplicate of this bug. ***
Comment 26 Jakub Moc (RETIRED) gentoo-dev 2005-04-19 02:31:52 UTC
*** Bug 89635 has been marked as a duplicate of this bug. ***
Comment 27 Jakub Moc (RETIRED) gentoo-dev 2005-04-19 15:40:19 UTC
*** Bug 89726 has been marked as a duplicate of this bug. ***